summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Don't backup/restore ringer mode" into klp-devAmith Yamasani2013-10-071-3/+0
|\
| * Don't backup/restore ringer modeAmith Yamasani2013-10-071-3/+0
* | Merge "camera2: describe non-full hw level optional tag entries" into klp-devAlex Ray2013-10-072-0/+18
|\ \
| * | camera2: describe non-full hw level optional tag entriesAlex Ray2013-10-022-0/+18
* | | Use SCREEN Xfermode for keyguard badges; update SeekBarAdam Powell2013-10-071-0/+15
* | | Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-devIgor Murashkin2013-10-071-0/+9
|\ \ \
| * | | camera2: Workaround for null FACE_DETECT_MODE crashingIgor Murashkin2013-10-071-0/+9
* | | | Merge "The undefined media sizes for both orientations not properly construct...Svetoslav Ganov2013-10-071-2/+2
|\ \ \ \
| * | | | The undefined media sizes for both orientations not properly constructed.Svetoslav Ganov2013-10-061-2/+2
* | | | | Merge "Camera2: fix Face class java doc build break" into klp-devZhijun He2013-10-071-3/+3
|\ \ \ \ \
| * | | | | Camera2: fix Face class java doc build breakZhijun He2013-10-071-3/+3
* | | | | | Merge "Add <intent-filter> support to <provider>." into klp-devJeff Sharkey2013-10-077-19/+122
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add <intent-filter> support to <provider>.Jeff Sharkey2013-10-077-19/+122
* | | | | | Merge "Camera2: Fire all callbacks" into klp-devEino-Ville Talvala2013-10-073-114/+203
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Camera2: Fire all callbacksEino-Ville Talvala2013-10-073-114/+203
* | | | | | Merge "Camera2: add metadata override" into klp-devRachad Alao2013-10-073-32/+179
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Camera2: add metadata overrideZhijun He2013-10-073-32/+179
* | | | | | Fix transparent -> translucent reference in private docs.John Spurlock2013-10-071-1/+1
|/ / / / /
* | | | | Merge "Transparent system ui flags -> Translucent WM flags." into klp-devJohn Spurlock2013-10-073-25/+94
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Transparent system ui flags -> Translucent WM flags.John Spurlock2013-10-063-25/+94
| |/ / /
* | | | Merge "Fix resource-loading code for TransitionSet" into klp-devChet Haase2013-10-062-1/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Fix resource-loading code for TransitionSetChet Haase2013-10-062-1/+17
* | | | Merge "Small print API tweaks" into klp-devSvetoslav2013-10-043-3/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Small print API tweaksSvetoslav2013-10-043-3/+16
* | | | Merge "Enable transitions in lockscreen media controller" into klp-devChet Haase2013-10-042-8/+6
|\ \ \ \
| * | | | Enable transitions in lockscreen media controllerChet Haase2013-10-042-8/+6
* | | | | Merge "Fix build." into klp-devEino-Ville Talvala2013-10-041-1/+1
|\ \ \ \ \
| * | | | | Fix build.Eino-Ville Talvala2013-10-041-1/+1
* | | | | | Merge "Camera2: Verbosity is verboten." into klp-devEino-Ville Talvala2013-10-041-7/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Camera2: Verbosity is verboten.Eino-Ville Talvala2013-10-041-7/+15
| | |/ / / | |/| | |
* | | | | Merge "Fix infinite recursion in hashcode of Spannables" into klp-devChet Haase2013-10-042-16/+32
|\ \ \ \ \
| * | | | | Fix infinite recursion in hashcode of SpannablesChet Haase2013-10-042-16/+32
| | |/ / / | |/| | |
* | | | | Merge "Print attributes hint not honored." into klp-devSvetoslav Ganov2013-10-041-2/+23
|\ \ \ \ \
| * | | | | Print attributes hint not honored.Svetoslav Ganov2013-10-041-2/+23
| | |/ / / | |/| | |
* | | | | Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-devAlan Viverette2013-10-042-8/+12
|\ \ \ \ \
| * | | | | Fix font scaling issues in FastScroller and SubtitleViewAlan Viverette2013-10-042-8/+12
* | | | | | Merge "Fix Text appears on top of existing text when composing in gmail." int...Raph Levien2013-10-041-3/+5
|\ \ \ \ \ \
| * | | | | | Fix Text appears on top of existing text when composing in gmail.Raph Levien2013-10-031-3/+5
* | | | | | | Merge "Avoid NPE when ProviderInfo is missing." into klp-devJeff Sharkey2013-10-041-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Avoid NPE when ProviderInfo is missing.Jeff Sharkey2013-10-041-1/+1
* | | | | | | Merge "Add Consumer IR feature" into klp-devAlex Ray2013-10-041-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Add Consumer IR featureAlex Ray2013-10-031-0/+8
* | | | | | | | Merge "Revert "Use a build-specific wifi country code"" into klp-devRobert Greenwalt2013-10-041-0/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Revert "Use a build-specific wifi country code"Robert Greenwalt2013-10-031-0/+7
* | | | | | | | Merge "Un-deprecate getDhcpInfo" into klp-devRobert Greenwalt2013-10-041-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Un-deprecate getDhcpInfoRobert Greenwalt2013-10-041-1/+0
* | | | | | | | Fix CookieSyncManager for WebViewClassicJonathan Dixon2013-10-041-0/+4
* | | | | | | | Merge "Fix a bug in action menu measurement" into klp-devAdam Powell2013-10-043-4/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix a bug in action menu measurementAdam Powell2013-10-033-4/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Use networkType to display wifi and mobile notification separately." ...Wink Saville2013-10-041-10/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |