Commit Graph

26525 Commits

Author SHA1 Message Date
Jason Monk
d39dee89cb Merge "Fix keywords for default home app" into nyc-dev am: c6aa18b
am: 22e2ee8

* commit '22e2ee8638a057b5fe6e1683b4b3d3e02fd60210':
  Fix keywords for default home app

Change-Id: I7e1efd4a23a8c1b9db50ab254e792b184d17acfb
2016-03-30 19:28:16 +00:00
Jason Monk
1589002d97 Merge "Only show enabled/disabled filters in main app list" into nyc-dev am: 800c912
am: 99d3d5c

* commit '99d3d5ccf2ab7d7acfab7d6ee1af7818edccd624':
  Only show enabled/disabled filters in main app list

Change-Id: I11bcdc9761574e853bb930fc946ec3877ea81014
2016-03-30 19:28:16 +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
Joseph Pirozzo
e6de78375f PBAP Pairing Permission
Remove the always there checkbox for phonebook permission when pairing
from a device that supports the client side of PBAP rather than the
server side.  A device should not support both PBAP PSE and PCE.

Bug: 25933871
Change-Id: I9535bbb9d5fcdfeaa13a2fec3461f47bb5518e28
2016-03-30 11:46:50 -07:00
Yohei Yukawa
a9341c38e3 Remove gear icon from InputMethodPreference.
Per comment from UX, we do not show gear icons on InputMethodPreference
because there is no difference between tapping the item itself and
tapping the gear icon.

Bug: 27543291
Change-Id: Ieea9a13a4b7af9c90c3a2a8f365bd318663998b1
2016-03-30 11:45:00 -07:00
Yohei Yukawa
611410a8c4 Update title to "Add or edit virtual keyboards".
Per comment from UX, we replace "Add virtual keyboard" with
"Add or edit virtual keyboards" because the user is able to not only
enable but also disable virtual keyboards.

Bug: 27543291
Change-Id: Id2ae61519152bbe622aa5915f728a4cbbc49e078
2016-03-30 11:40:30 -07:00
Jason Monk
7681482f6d Merge "Fix bridged app list saved scroll state" into nyc-dev am: a9537a5
am: df22fc5

* commit 'df22fc52a253d98ba0f180931b2f1a5c2daa359a':
  Fix bridged app list saved scroll state

Change-Id: I31e6244f057306306fd66af003fcb1cc1380bb98
2016-03-30 17:48:27 +00:00
Muyuan Li
3777014881 Intent to start app memory usage page. am: ba115af
am: b69a359

* commit 'b69a359f49dc5b474f6f313558042b377bf3aaa4':
  Intent to start app memory usage page.

Change-Id: I87f7252ee1e0d637b26afa037e5678af09c53cfd
2016-03-30 17:48:27 +00: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
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

* commit 'aafabbabab3771b89944ea2a7aea2b4f7b8ba071':
  Fix sim pin settings

Change-Id: I26a86f87522a50933d8d7a293b1b3c9089043f4c
2016-03-30 16:43:54 +00:00
Jason Monk
36b12b7e63 Merge "Revert "Rename more to other networks"" into nyc-dev am: fd91887
am: 79a6273

* commit '79a6273c314ead12890a43dba7fd5287614ed35b':
  Revert "Rename more to other networks"

Change-Id: I5d9f42aceab52dc108e6141e92bf629f440f6441
2016-03-30 16:39:51 +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
Yohei Yukawa
07e37d01af Merge "Use word "languages" in favor of multi-locale support." into nyc-dev am: d719ae8
am: b23838b

* commit 'b23838b3792523862a0cba582b3256b6d52dd5f0':
  Use word "languages" in favor of multi-locale support.

Change-Id: I9337e0ae6710d45a267663b2bb1ce48bc81d80b3
2016-03-30 16:25:17 +00:00
Jason Monk
5b39710e6d Fix sim pin settings
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes: 27419276
Fixes: 27529989
2016-03-30 11:41:45 -04:00
Clara Bayarri
3842cf1a3f Change Work Challenge background image
As requested by UX

Bug: 27829562
Change-Id: Ib893dca102cdccf46102fa45e3501d43fd17b558
2016-03-30 14:57:58 +01: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
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
Jim Miller
d12166e411 Fix crash in ConfirmDeviceCredentials
This reverts the workaround for bug 23849216 which has since
been fixed.

Fixes bug 27138063

Change-Id: Ifab4d072d0c95bb121bf3a9d852f2b16e92b7144
2016-03-29 18:34:53 -07:00
Christopher Tate
26e63245a5 Merge "Improve notes on "Opening links" and related strings" into nyc-dev am: dafc5df
am: 87df81e

* commit '87df81ec238d9fc131eb0c2e26f2639f3560a28f':
  Improve notes on "Opening links" and related strings

Change-Id: Ie65e034563031099a8b7e91d745c3b7f8141a70f
2016-03-30 00:42:53 +00:00
Mihai Nita
f68a35c174 Merge "Fix locale reorder jank" into nyc-dev am: 0189850
am: 0a7d2f8

* commit '0a7d2f8a1a175a35d94c3c39c08875b7e4507010':
  Fix locale reorder jank

Change-Id: I0ff66863afda688d8683f4b0e3393bf07fc81256
2016-03-30 00:42:53 +00:00
Daichi Hirono
70cfa7d8fe Change the dialog text in USB device tyep chooser.
Updates the texts to the new ones from UX.

Change-Id: Id741a9685c230e005019fe4b57933617fa67d257
Fixed: 27843605
2016-03-30 09:38:52 +09: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
854823acc7 Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev am: a859441
am: 92ab671

* commit '92ab671167cb8022e0da07c48ab53cd4dd67dab1':
  Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339

Change-Id: I724a7b9488dfb4cd355402d4e4855b2cacd8878b
2016-03-29 22:07:02 +00: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
8d1d327165 Merge "Fixes back button on action bar on some fragments." into nyc-dev am: 2b1d00b
am: 429f75b

* commit '429f75bd8d1659db6564a238461c4a6389fa4f73':
  Fixes back button on action bar on some fragments.

Change-Id: I58664a2fcfaff413a83820167f388948568bd51c
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

* 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