Noah Wang
27e624829c
Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev am: ca1abaa
...
am: 52e0b82
2016-03-31 02:15:34 +00:00
Noah Wang
52e0b820c3
Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev
...
am: ca1abaa
2016-03-31 02:13:07 +00:00
Noah Wang
ca1abaa953
Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug: 27674946" into nyc-dev
2016-03-31 00:37:02 +00:00
Noah Wang
a0c429a1b6
Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev am: 74df3ec
...
am: 3859720
2016-03-30 21:53:05 +00:00
Noah Wang
38597204cb
Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev
...
am: 74df3ec
2016-03-30 21:48:50 +00:00
Anna Galusza
8054164f98
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev am: d2a686f
...
am: 1b48ca5
2016-03-30 21:48:48 +00:00
Anna Galusza
1b48ca589b
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev
...
am: d2a686f
2016-03-30 21:43:40 +00:00
Noah Wang
74df3ec002
Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev
2016-03-30 21:41:42 +00:00
Anna Galusza
d2a686fbc2
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev
2016-03-30 21:39:05 +00:00
Noah Wang
abf6312b8d
Make preview screens in font/display size settings scrollable
...
Bug: 27274145
Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
2016-03-30 14:32:32 -07:00
Amith Yamasani
4cb667f036
Merge "Don\'t prompt twice to uninstall updates" into nyc-dev am: 8df0415
...
am: 251b5a9
2016-03-30 20:57:19 +00:00
Amith Yamasani
251b5a9a63
Merge "Don\'t prompt twice to uninstall updates" into nyc-dev
...
am: 8df0415
2016-03-30 20:50:43 +00:00
Amith Yamasani
8df04151d0
Merge "Don't prompt twice to uninstall updates" into nyc-dev
2016-03-30 20:43:03 +00:00
Jason Monk
9c30c2a76e
Merge "Fix wifi animation issues" into nyc-dev am: b9b1c08
...
am: a3ceb5a
2016-03-30 20:38:04 +00:00
Jason Monk
a3ceb5ab56
Merge "Fix wifi animation issues" into nyc-dev
...
am: b9b1c08
2016-03-30 20:33:39 +00:00
Jason Monk
b9b1c083e4
Merge "Fix wifi animation issues" into nyc-dev
2016-03-30 20:24:19 +00:00
Jason Monk
85da859392
Fix wifi animation issues
...
There are still some remaining animation issues on the wifi screen.
To avoid regressions from M, just disable animations on the entire
wifi screen.
Change-Id: Iabf8ace731638ae7af483c6f3887ca351b17ac60
Fixes: 26271353
2016-03-30 16:22:39 -04:00
Udam Saini
dd114078f4
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev am: 1f361c2
...
am: 2a488fc
2016-03-30 20:17:33 +00:00
Udam Saini
2a488fc540
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev
...
am: 1f361c2
2016-03-30 20:13:18 +00:00
Udam Saini
1f361c25e0
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev
2016-03-30 20:05:45 +00:00
Jason Monk
1589002d97
Merge "Only show enabled/disabled filters in main app list" into nyc-dev am: 800c912
...
am: 99d3d5c
2016-03-30 19:28:16 +00:00
Jason Monk
99d3d5ccf2
Merge "Only show enabled/disabled filters in main app list" into nyc-dev
...
am: 800c912
2016-03-30 19:21:43 +00:00
Jason Monk
800c912f7a
Merge "Only show enabled/disabled filters in main app list" into nyc-dev
2016-03-30 18:53:32 +00:00
Jason Monk
4a25f35680
Only show enabled/disabled filters in main app list
...
Change-Id: I8d7c94098b71f5893b08786a4caa90d9c191da99
Fixes: 27921850
2016-03-30 14:51:52 -04:00
Jason Monk
7681482f6d
Merge "Fix bridged app list saved scroll state" into nyc-dev am: a9537a5
...
am: df22fc5
2016-03-30 17:48:27 +00:00
Muyuan Li
3777014881
Intent to start app memory usage page. am: ba115af
...
am: b69a359
2016-03-30 17:48:27 +00:00
Jason Monk
df22fc52a2
Merge "Fix bridged app list saved scroll state" into nyc-dev
...
am: a9537a5
2016-03-30 17:44:07 +00:00
Muyuan Li
b69a359f49
Intent to start app memory usage page.
...
am: ba115af
2016-03-30 17:44:07 +00:00
Jason Monk
a9537a57d5
Merge "Fix bridged app list saved scroll state" into nyc-dev
2016-03-30 17:26:55 +00:00
Jason Monk
228638019d
Fix bridged app list saved scroll state
...
(don't clear the list when we have the info)
Fixes: 27185911
Change-Id: Ieda4fd0fc6dd662741da9a1805c1435d4473490d
2016-03-30 13:26:30 -04:00
Muyuan Li
ba115afd52
Intent to start app memory usage page.
...
Start the app with intent: android.settings.APP_MEMORY_USAGE will bring
up this page.
Bug: 26820467
Change-Id: I50690c71e8182735ea14fdf42a4812573f650e1b
(cherry picked from commit b816812a4f68a1841703da5d29b32ccafd0896f6)
2016-03-30 17:13:22 +00:00
Jason Monk
6e20cd86b2
resolve merge conflicts of 4038f15 to master
...
Change-Id: Ifae7060ab23ad7619a5fdd01315a2d3e7c8a3845
2016-03-30 12:58:09 -04:00
Amith Yamasani
bacc708f96
Don't prompt twice to uninstall updates
...
PackageInstaller is going to ask again, so skip
asking in Settings when user wants to uninstall
updates to a system app.
Bug: 26694521
Change-Id: I4335a4e9bfe54985eb58ba19a890caba06705bef
2016-03-30 09:52:33 -07:00
Jason Monk
4038f15af3
Merge "Fix sim pin settings" into nyc-dev
...
am: aafabba
2016-03-30 16:43:54 +00:00
Jason Monk
5b39710e6d
Fix sim pin settings
...
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes: 27419276
Fixes: 27529989
2016-03-30 11:41:45 -04:00
Noah Wang
c89855aef9
Fix crashing of font size settings screen due to the timing
...
of initialization of ExploreByTouchHelper
Bug: 27674946
Change-Id: Ief92b5db975861aa31029712854e78edf4454eb5
2016-03-29 20:28:05 -07:00
Mihai Nita
f68a35c174
Merge "Fix locale reorder jank" into nyc-dev am: 0189850
...
am: 0a7d2f8
2016-03-30 00:42:53 +00:00
Mihai Nita
0a7d2f8a1a
Merge "Fix locale reorder jank" into nyc-dev
...
am: 0189850
2016-03-30 00:28:53 +00:00
Mihai Niță
018985064d
Merge "Fix locale reorder jank" into nyc-dev
2016-03-29 23:33:21 +00:00
Udam Saini
5a1dbf8152
Wait for fingerprints to be removed (Partial fix).
...
This is a partial fix for b/27903189.
When we remove the lock screen and remove all fingerprints, wait for
them to all be removed before finishing the activity. This will let
the security screen accurately show how many fingerprints are available.
bug:27903189
Change-Id: I30908dbefb7a858f6d99e532841ed4ff894bfe62
2016-03-29 15:12:44 -07:00
Udam Saini
8d1d327165
Merge "Fixes back button on action bar on some fragments." into nyc-dev am: 2b1d00b
...
am: 429f75b
2016-03-29 19:54:56 +00:00
Udam Saini
429f75bd8d
Merge "Fixes back button on action bar on some fragments." into nyc-dev
...
am: 2b1d00b
2016-03-29 19:51:58 +00:00
Udam Saini
2b1d00bf22
Merge "Fixes back button on action bar on some fragments." into nyc-dev
2016-03-29 19:42:27 +00:00
Victor Chang
347888f094
Merge "Remove VPN Overflow menu" into nyc-dev am: 2037876
...
am: 24ac9d9
2016-03-29 19:02:42 +00:00
Victor Chang
24ac9d93ca
Merge "Remove VPN Overflow menu" into nyc-dev
...
am: 2037876
2016-03-29 18:59:46 +00:00
Victor Chang
2037876888
Merge "Remove VPN Overflow menu" into nyc-dev
2016-03-29 18:51:33 +00:00
Jason Monk
e86d54d041
Merge "Fix crash when clearing preference screen" into nyc-dev am: 2c313f0
...
am: 2c1bfe3
2016-03-29 17:30:26 +00:00
Udam Saini
0708d9e119
Fixes back button on action bar on some fragments.
...
SettingsPreferenceFragment has this already set so that the drawer
layout will work when the menu doesn't exist. However, some fragments
are not preference fragments, and we need to set setHasOptionsMenu
manually.
bug:27879503
Change-Id: I6faadeb56dab00af611ac413109800822038c66d
2016-03-29 10:29:14 -07:00
Jason Monk
2c1bfe37c1
Merge "Fix crash when clearing preference screen" into nyc-dev
...
am: 2c313f0
2016-03-29 17:27:14 +00:00
Jason Monk
2c313f0e93
Merge "Fix crash when clearing preference screen" into nyc-dev
2016-03-29 17:23:32 +00:00
