Amith Yamasani
251b5a9a63
Merge "Don\'t prompt twice to uninstall updates" into nyc-dev
...
am: 8df0415
* commit '8df04151d0461ce1520043eb74943f67f9a74aa8':
Don't prompt twice to uninstall updates
Change-Id: I35169cfa6a2936638309b23a76c5bcd636df6dc9
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
a3ceb5ab56
Merge "Fix wifi animation issues" into nyc-dev
...
am: b9b1c08
* commit 'b9b1c083e4bd59e17e29d9b5de4b8fed0a754fb6':
Fix wifi animation issues
Change-Id: I33fda33647e5f9f05af4c57da538836a48bc6e3c
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
2a488fc540
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev
...
am: 1f361c2
* commit '1f361c25e09ee07dd0babb4e7b9a8d3720f0ca31':
Wait for fingerprints to be removed (Partial fix).
Change-Id: If4d49cc787554adf56451cff0fb7239e4dda9318
2016-03-30 20:13:18 +00:00
Noah Wang
825b0506ff
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev
...
am: 1308bd8
* commit '1308bd8bb1f1223c57a867246542ec22d7f9ef53':
Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035
Change-Id: I73c5c49f685670b7a5f91c46dde0ac693f1d5fa2
2016-03-30 20:06:33 +00:00
Noah Wang
88bb01d96f
Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev
...
am: bcf590c
* commit 'bcf590c88ad07865f20e5b1500f3815c03a32cb9':
Set minimum height for preview screen of font/display size settings Bug: 27699996
Change-Id: I2875bbb371f8426aac82b13c8be871476cc43200
2016-03-30 20:06:33 +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
Noah Wang
1308bd8bb1
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug: 27326035" into nyc-dev
2016-03-30 20:03:38 +00:00
Noah Wang
bcf590c88a
Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev
2016-03-30 20:03:13 +00:00
Jason Monk
22e2ee8638
Merge "Fix keywords for default home app" into nyc-dev
...
am: c6aa18b
* commit 'c6aa18bcd96ba5085153ad46bcf187dfe3c009f5':
Fix keywords for default home app
Change-Id: I5dcdafcba6be8549d8ee874b131d99532959adbb
2016-03-30 19:21:44 +00:00
Jason Monk
99d3d5ccf2
Merge "Only show enabled/disabled filters in main app list" into nyc-dev
...
am: 800c912
* commit '800c912f7a8ade7cb9fd501c97c57bd946b4374d':
Only show enabled/disabled filters in main app list
Change-Id: I986446866b88a744efe20102466b568f24614d54
2016-03-30 19:21:43 +00:00
Jason Monk
c6aa18bcd9
Merge "Fix keywords for default home app" into nyc-dev
2016-03-30 19:11:18 +00:00
Jason Monk
d2c753f0fb
Fix keywords for default home app
...
Change-Id: I38851f70d34168f906cf9b7223772bb3442852db
Fixes: 27826745
2016-03-30 15:09:20 -04: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
df22fc52a2
Merge "Fix bridged app list saved scroll state" into nyc-dev
...
am: a9537a5
* commit 'a9537a57d59a1b79b999655494af713048f051e9':
Fix bridged app list saved scroll state
Change-Id: Ia28306bc196abd0764bde0e40c4dd928a5d2aafa
2016-03-30 17:44:07 +00:00
Muyuan Li
b69a359f49
Intent to start app memory usage page.
...
am: ba115af
* commit 'ba115afd52dea0c2db6966748d4cb3b9ff262880':
Intent to start app memory usage page.
Change-Id: I8ab11e9ed73b668ba47752bc87a578c9237b0e35
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
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
* commit 'aafabbabab3771b89944ea2a7aea2b4f7b8ba071':
Fix sim pin settings
Change-Id: I26a86f87522a50933d8d7a293b1b3c9089043f4c
2016-03-30 16:43:54 +00:00
Jason Monk
aafabbabab
Merge "Fix sim pin settings" into nyc-dev
2016-03-30 16:36:26 +00:00
Jason Monk
79a6273c31
Merge "Revert "Rename more to other networks"" into nyc-dev
...
am: fd91887
* commit 'fd918873110586911ea7dd3cab526088114fed7e':
Revert "Rename more to other networks"
Change-Id: I022c8d2570b1c6d1e9ce58328048e4354e2114ae
2016-03-30 16:35:49 +00:00
Jason Monk
fd91887311
Merge "Revert "Rename more to other networks"" into nyc-dev
2016-03-30 16:31:34 +00:00
Jason Monk
5b39710e6d
Fix sim pin settings
...
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes: 27419276
Fixes: 27529989
2016-03-30 11:41:45 -04:00
Yohei Yukawa
b23838b379
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev
...
am: d719ae8
* commit 'd719ae8e37345f2e789d4a30932f3bfd9334817a':
Use word "languages" in favor of multi-locale support.
Change-Id: I8c4a4abe8f4e6c1ec959b7c59efa555b3e0436cb
2016-03-30 06:09:04 +00:00
Yohei Yukawa
d719ae8e37
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev
2016-03-30 06:00:24 +00:00
Noah Wang
a8ef32b969
Adding contentDescription to ViewPager in font/display size settings.
...
Bug: 27326035
Change-Id: I416c05f2fc7c9238a61b8d512f09cb834f8ec537
2016-03-29 21:32:18 -07:00
Noah Wang
80a0e93c8d
Set minimum height for preview screen of font/display size settings
...
Bug: 27699996
Change-Id: I1e2e16a355993f058301c57d29857f6fca8ec858
2016-03-29 21:04:17 -07:00
Yohei Yukawa
c4204c3ba6
Use word "languages" in favor of multi-locale support.
...
In Android N, the user is able to select multiple languages. Hence
in the IME subtype enabler "Use system language" should be updated to
"Use system languages".
Bug: 27722513
Change-Id: Idcc2fa7eecd1316feac04774ff18c42614a0dc9a
2016-03-29 20:44:01 -07:00
Christopher Tate
87df81ec23
Merge "Improve notes on "Opening links" and related strings" into nyc-dev
...
am: dafc5df
* commit 'dafc5df280bcd6912a06f2861f07691906ffe1c0':
Improve notes on "Opening links" and related strings
Change-Id: I1a6c2f35174c1da55a8e83bc15ec09e370f6f515
2016-03-30 00:28:54 +00:00
Mihai Nita
0a7d2f8a1a
Merge "Fix locale reorder jank" into nyc-dev
...
am: 0189850
* commit '018985064d938b36c125ac1bdac73a9208e5da9f':
Fix locale reorder jank
Change-Id: I97c86470f1530f5b3da130ce22631cf1d6a186c0
2016-03-30 00:28:53 +00:00
Chris Tate
dafc5df280
Merge "Improve notes on "Opening links" and related strings" into nyc-dev
2016-03-30 00:13:59 +00:00
Christopher Tate
1e230cb1b8
Improve notes on "Opening links" and related strings
...
Bug 27857777
Change-Id: Ie4c70bca29c7b93c6bb9989b3bb3dc80bae6d805
2016-03-29 17:09:41 -07: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
Noah Wang
92ab671167
Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev
...
am: a859441
* commit 'a85944104c6fe22947387d0ced613e07f6251d40':
Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339
Change-Id: I6ad269c28c04404d27f0050600e48cc68c11a061
2016-03-29 22:00:56 +00:00
Noah Wang
a85944104c
Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev
2016-03-29 21:56:14 +00:00
Udam Saini
429f75bd8d
Merge "Fixes back button on action bar on some fragments." into nyc-dev
...
am: 2b1d00b
* commit '2b1d00bf22a3d0c8596e15b7b20c3e1fa65d7abd':
Fixes back button on action bar on some fragments.
Change-Id: Id03745d3178e6c6b15e1fc0d9fdc18c4f4bf6184
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
24ac9d93ca
Merge "Remove VPN Overflow menu" into nyc-dev
...
am: 2037876
* commit '2037876888db8a33b28cf5f876b5e47deec0da72':
Remove VPN Overflow menu
Change-Id: I248091e385321e75df345e4f5aab938a5fcec166
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
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
* commit '2c313f0e934c0e669b8c21519bb70eb5639b7a97':
Fix crash when clearing preference screen
Change-Id: I6446500ce33534f7cc28c9b1431adc20b5723f71
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
Jason Monk
1cb12bbd60
Fix crash when clearing preference screen
...
Bug: 27892359
Change-Id: I96cd167e8173bf0345c3e186fa11c2e613b63e6f
2016-03-29 13:21:48 -04:00
Jason Monk
4a0575081c
Revert "Rename more to other networks"
...
Bug: 27638488
This reverts commit 34ed8a243b .
Change-Id: I5e10e11d40d24ae26c8605f832c43bd41c62c1dc
2016-03-29 17:12:56 +00:00