OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoWifiCallingSettings: remove MetricsLogger
Meng Wang [Thu, 29 Sep 2016 18:36:11 +0000 (11:36 -0700)]
WifiCallingSettings: remove MetricsLogger

Test: make
Change-Id: Ifd9ac2f6b35bd851f29189c090e49c0728730ec0

7 years agoMerge "Settings timeout for suggestions"
TreeHugger Robot [Thu, 29 Sep 2016 18:44:23 +0000 (18:44 +0000)]
Merge "Settings timeout for suggestions"

7 years agoSettings timeout for suggestions
Salvador Martinez [Tue, 20 Sep 2016 00:02:37 +0000 (17:02 -0700)]
Settings timeout for suggestions

If loading suggestions takes too long (750ms)
settings will display just the categories
so the user does not get confused.

Test: Forthcoming
Bug: 31203004
Change-Id: Ic9866a5ccdcef965908db8c4592435a5d252f7b0

7 years agoMerge "Add classloader for RtlCompatibleViewPager"
Lei Yu [Thu, 29 Sep 2016 16:52:36 +0000 (16:52 +0000)]
Merge "Add classloader for RtlCompatibleViewPager"

7 years agoWifiCallingSettings: Fix build.
Narayan Kamath [Thu, 29 Sep 2016 14:09:55 +0000 (15:09 +0100)]
WifiCallingSettings: Fix build.

Test: make
Change-Id: Ic22e32c960380fd6c2a6fa959d613941d13d815b

7 years agoImport translations. DO NOT MERGE am: dccfc04a3e -s ours am: ae35fa061e -s ours...
Bill Yi [Thu, 29 Sep 2016 08:07:18 +0000 (08:07 +0000)]
Import translations. DO NOT MERGE am: dccfc04a3e  -s ours am: ae35fa061e  -s ours am: a69e26abbf  -s ours
am: 58fb70211c  -s ours

Change-Id: I485c9bae825e7babd507e7ad0b7f33f070993c09

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours...
Bill Yi [Thu, 29 Sep 2016 08:07:04 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345  -s ours am: c53fb015d9  -s ours
am: 1ed1b99ad0  -s ours

Change-Id: If291c9d8e93d276a683a0f389ee497a7b7801eed

7 years agoImport translations. DO NOT MERGE am: 4ae03656ac -s ours am: ae3ec3984d -s ours
Bill Yi [Thu, 29 Sep 2016 08:06:50 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE am: 4ae03656ac  -s ours am: ae3ec3984d  -s ours
am: d44a01ba45  -s ours

Change-Id: I103cc64e34aaac7afe85d8b750a903c181cd6c82

7 years agoImport translations. DO NOT MERGE am: dccfc04a3e -s ours am: ae35fa061e -s ours
Bill Yi [Thu, 29 Sep 2016 08:01:47 +0000 (08:01 +0000)]
Import translations. DO NOT MERGE am: dccfc04a3e  -s ours am: ae35fa061e  -s ours
am: a69e26abbf  -s ours

Change-Id: If22270482cf8caffc0baa84e6205903e73f1f7fc

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours
Bill Yi [Thu, 29 Sep 2016 07:57:41 +0000 (07:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345  -s ours
am: c53fb015d9  -s ours

Change-Id: I86a1e1bd6a7ef84d41b743d1ac1b0827183ff94f

7 years agoImport translations. DO NOT MERGE am: 4ae03656ac -s ours
Bill Yi [Thu, 29 Sep 2016 07:57:26 +0000 (07:57 +0000)]
Import translations. DO NOT MERGE am: 4ae03656ac  -s ours
am: ae3ec3984d  -s ours

Change-Id: I43fbba4e5f8c55a438233ac120f0af00300b8a25

7 years agoImport translations. DO NOT MERGE am: dccfc04a3e -s ours
Bill Yi [Thu, 29 Sep 2016 07:57:16 +0000 (07:57 +0000)]
Import translations. DO NOT MERGE am: dccfc04a3e  -s ours
am: ae35fa061e  -s ours

Change-Id: Iefe3d69297ef0f4cb04ede83b2b93b523678c3ff

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 07:53:15 +0000 (07:53 +0000)]
Import translations. DO NOT MERGE
am: dccfc04a3e  -s ours

Change-Id: Ia00dff846fc9174b6f5f4284e3d42f1ad9869ec7

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 29 Sep 2016 07:48:48 +0000 (07:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f497c48345  -s ours

Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 07:48:46 +0000 (07:48 +0000)]
Import translations. DO NOT MERGE
am: 4ae03656ac  -s ours

Change-Id: I69bfb0033fd813af6242dead9e30d4a1bfcd3cd6

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 29 Sep 2016 07:40:48 +0000 (07:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 06:25:18 +0000 (23:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0cd1cb776f4dda8b02f683d92cda3efedff989bb
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 06:20:25 +0000 (23:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4a6114d77d04143e22aa02f591cc6f7b75444d46
Auto-generated-cl: translation import

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc...
Hugo Benichi [Thu, 29 Sep 2016 05:59:54 +0000 (05:59 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc am: 9bd60dd8ac
am: f153b4bfc8

Change-Id: I8d577e0bf2edc97bcf0c3a6b39bb29a27db75a6b

7 years agoUpdate text of wifi to cell autoswitch toggle am: 1968fb1fd4 am: b00a9135ba
Hugo Benichi [Thu, 29 Sep 2016 05:59:38 +0000 (05:59 +0000)]
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4 am: b00a9135ba
am: 55e04b82af

Change-Id: I5d3f8e6f7e8b158ade94cd757940d3134e6f1d81

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c...
Matthew Fritze [Thu, 29 Sep 2016 05:59:22 +0000 (05:59 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c am: 493350dcf7
am: 7d79557c56

Change-Id: I0f5cb93802bea6f7f5af9e586a65d7e6a6a42d8c

7 years agoTablet Settings Layout is no longer stretched am: c4a9b18121 am: a936610ae2
Matthew Fritze [Thu, 29 Sep 2016 05:59:08 +0000 (05:59 +0000)]
Tablet Settings Layout is no longer stretched am: c4a9b18121 am: a936610ae2
am: fa7aa9663e

Change-Id: I7865b06593fc99cabe78dac7bb4a3574dea79404

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d...
Meng Wang [Thu, 29 Sep 2016 05:58:51 +0000 (05:58 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d am: 2c545d5bfa
am: 82812ff668

Change-Id: Ida62a975931cd05e2af01f66d337df8f0702fffc

7 years agoWiFiCallingSettings: show roaming preferrence am: fe3749dd0b am: 335b3488f9
Meng Wang [Thu, 29 Sep 2016 05:55:00 +0000 (05:55 +0000)]
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b am: 335b3488f9
am: 9f0d5f7e5d

Change-Id: Ie899eba9566d12534dd9bf524542c1a5f00cb38b

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
Hugo Benichi [Thu, 29 Sep 2016 03:50:16 +0000 (03:50 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
am: 9bd60dd8ac

Change-Id: I0abb48f432879b686ee179069c366753ada31161

7 years agoUpdate text of wifi to cell autoswitch toggle am: 1968fb1fd4
Hugo Benichi [Thu, 29 Sep 2016 03:50:01 +0000 (03:50 +0000)]
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4
am: b00a9135ba

Change-Id: Icb2059fe884e7020ad843158db1af444b2641d61

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
Hugo Benichi [Thu, 29 Sep 2016 03:46:11 +0000 (03:46 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
am: c81e1141cc

Change-Id: Idf215a22923b96129462579816e170655f99d4e8

7 years agoUpdate text of wifi to cell autoswitch toggle
Hugo Benichi [Thu, 29 Sep 2016 03:46:10 +0000 (03:46 +0000)]
Update text of wifi to cell autoswitch toggle
am: 1968fb1fd4

Change-Id: I58f87f2befc0dbcb1fa0ea43dc9255a7849984f6

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
TreeHugger Robot [Thu, 29 Sep 2016 03:38:46 +0000 (03:38 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev

7 years agoUpdate text of wifi to cell autoswitch toggle
Hugo Benichi [Thu, 29 Sep 2016 00:16:55 +0000 (09:16 +0900)]
Update text of wifi to cell autoswitch toggle

Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0

7 years agoAdd classloader for RtlCompatibleViewPager
jackqdyulei [Wed, 28 Sep 2016 21:57:26 +0000 (14:57 -0700)]
Add classloader for RtlCompatibleViewPager

To avoid BadParcelableException when reload the activity after it
is killed by OS.

Bug: 31707097
Test: make SettingsTests && adb install -r \
${OUT}/data/app/SettingsTests/SettingsTests.apk && \
adb shell am instrument -w \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'

Change-Id: Ic8f20d9e2d236f0bea96071a88fbc6e7ba856f54

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
Matthew Fritze [Thu, 29 Sep 2016 00:36:18 +0000 (00:36 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
am: 493350dcf7

Change-Id: I9b1e216adddaa1e995ef0d80280fc47d7a02bad8

7 years agoTablet Settings Layout is no longer stretched am: c4a9b18121
Matthew Fritze [Thu, 29 Sep 2016 00:36:04 +0000 (00:36 +0000)]
Tablet Settings Layout is no longer stretched am: c4a9b18121
am: a936610ae2

Change-Id: Ib6d604f753d3424d67396c9e051829cad43d6d76

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
Meng Wang [Thu, 29 Sep 2016 00:35:49 +0000 (00:35 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
am: 2c545d5bfa

Change-Id: I06bdabaabc3baec3faa82182cf8e0d0e208e252b

7 years agoWiFiCallingSettings: show roaming preferrence am: fe3749dd0b
Meng Wang [Thu, 29 Sep 2016 00:30:54 +0000 (00:30 +0000)]
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b
am: 335b3488f9

Change-Id: I9a6d86727a29991056f452b74bcc5632bb8750a9

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
Matthew Fritze [Thu, 29 Sep 2016 00:27:18 +0000 (00:27 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
am: 6cafff3b2c

Change-Id: I8cc65986d6b5788ccbc8919e0788cf2db4b7fade

7 years agoTablet Settings Layout is no longer stretched
Matthew Fritze [Thu, 29 Sep 2016 00:27:17 +0000 (00:27 +0000)]
Tablet Settings Layout is no longer stretched
am: c4a9b18121

Change-Id: Ie103fd6248bd206e517c5f7de880b76862b831ba

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
Meng Wang [Thu, 29 Sep 2016 00:26:56 +0000 (00:26 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
am: 2f6eef699d

Change-Id: Id6d84cd51171da42f21894617ec26fb48e45cfa9

7 years agoWiFiCallingSettings: show roaming preferrence
Meng Wang [Thu, 29 Sep 2016 00:22:18 +0000 (00:22 +0000)]
WiFiCallingSettings: show roaming preferrence
am: fe3749dd0b

Change-Id: I10a1a2e443e3c678db3fa892d4c1331339e8df85

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
TreeHugger Robot [Thu, 29 Sep 2016 00:16:23 +0000 (00:16 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
Meng Wang [Thu, 29 Sep 2016 00:13:49 +0000 (00:13 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev

7 years agoMerge "Settings suggestions now describes expand and collapse in talkback" into nyc...
Matthew Fritze [Wed, 28 Sep 2016 23:22:07 +0000 (23:22 +0000)]
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev am: fb0d4c8534 am: cdaddb365f
am: e8dd48370b

Change-Id: Ib05a5e65c2d9eb9899825ad16181802cbfc0be6b

7 years agoSettings suggestions now describes expand and collapse in talkback am: 62cf9efd9b...
Matthew Fritze [Wed, 28 Sep 2016 23:21:51 +0000 (23:21 +0000)]
Settings suggestions now describes expand and collapse in talkback am: 62cf9efd9b am: d522eff9e5
am: a7b7f86f1e

Change-Id: Icac895f280eb02b5cedebfec4d6b809431ea04f7

7 years agoMerge "Settings suggestions now describes expand and collapse in talkback" into nyc...
Matthew Fritze [Wed, 28 Sep 2016 23:01:26 +0000 (23:01 +0000)]
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev am: fb0d4c8534
am: cdaddb365f

Change-Id: I712be7226887900a0810c692615c5c3a39bf7c10

7 years agoSettings suggestions now describes expand and collapse in talkback am: 62cf9efd9b
Matthew Fritze [Wed, 28 Sep 2016 23:01:12 +0000 (23:01 +0000)]
Settings suggestions now describes expand and collapse in talkback am: 62cf9efd9b
am: d522eff9e5

Change-Id: I95c7c1e9f7e3cec8dc9d439b480b78b2520730fb

7 years agoMerge "Deligates some themes.xml attributes to dimens.xml."
Jaewoong Jung [Wed, 28 Sep 2016 22:59:59 +0000 (22:59 +0000)]
Merge "Deligates some themes.xml attributes to dimens.xml."

7 years agoMerge "Settings suggestions now describes expand and collapse in talkback" into nyc...
Matthew Fritze [Wed, 28 Sep 2016 22:58:11 +0000 (22:58 +0000)]
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev
am: fb0d4c8534

Change-Id: Ibdbf2f289d9e74e6517f3bb4c05e3436dd699e37

7 years agoSettings suggestions now describes expand and collapse in talkback
Matthew Fritze [Wed, 28 Sep 2016 22:58:10 +0000 (22:58 +0000)]
Settings suggestions now describes expand and collapse in talkback
am: 62cf9efd9b

Change-Id: Iba413a4b55d79d3baff5147b2a04f3c606b2f3a3

7 years agoDeligates some themes.xml attributes to dimens.xml.
Jaewoong Jung [Wed, 28 Sep 2016 00:44:24 +0000 (17:44 -0700)]
Deligates some themes.xml attributes to dimens.xml.

Bug: 31448445
Test: Inspected manually.
Change-Id: Ifda3424287cde4474eb20be53c3ff3e54e6eba5e

7 years agoMerge "Settings suggestions now describes expand and collapse in talkback" into nyc...
Matthew Fritze [Wed, 28 Sep 2016 22:52:26 +0000 (22:52 +0000)]
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev

7 years agoTablet Settings Layout is no longer stretched
Matthew Fritze [Wed, 28 Sep 2016 21:30:17 +0000 (14:30 -0700)]
Tablet Settings Layout is no longer stretched

Change-Id: If4a883077f41b859f4e8aaf92a4f397b94814137
Fixes: 31583422
Tests: Visual Inspection

7 years agoMerge "Add a warning message to the ASM toggle." into nyc-mr1-dev am: 24d63d17d6...
Daniel Nishi [Wed, 28 Sep 2016 22:13:52 +0000 (22:13 +0000)]
Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev am: 24d63d17d6 am: 6ee68d167f
am: 6a7a181be4

Change-Id: Ib2674883fa6e5cf90f8875b3d8ee0a53b4c25c08

7 years agoresolve merge conflicts of a4e3842 to master
Daniel Nishi [Wed, 28 Sep 2016 20:20:27 +0000 (13:20 -0700)]
resolve merge conflicts of a4e3842 to master

Change-Id: Ia52171f3cfa0bcb73c6a4d23122ef8ad9025e807

7 years agoMerge "Add a warning message to the ASM toggle." into nyc-mr1-dev am: 24d63d17d6
Daniel Nishi [Wed, 28 Sep 2016 18:41:40 +0000 (18:41 +0000)]
Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev am: 24d63d17d6
am: 6ee68d167f

Change-Id: I9984e28b7535acd4c63dfaf9187d7787c847d2b5

7 years agoAdd a warning message to the ASM toggle. am: 116b95666f
Daniel Nishi [Wed, 28 Sep 2016 18:41:24 +0000 (18:41 +0000)]
Add a warning message to the ASM toggle. am: 116b95666f
am: c409b02411

Change-Id: Id1e13a14aeb24917da0e5a78421b09b385ea0818

7 years agoMerge "Add a warning message to the ASM toggle." into nyc-mr1-dev
Daniel Nishi [Wed, 28 Sep 2016 18:38:23 +0000 (18:38 +0000)]
Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev
am: 24d63d17d6

Change-Id: I62c0604a9f1216f425a9a54bf3a2a2c509645b62

7 years agoAdd a warning message to the ASM toggle.
Daniel Nishi [Wed, 28 Sep 2016 18:38:22 +0000 (18:38 +0000)]
Add a warning message to the ASM toggle.
am: 116b95666f

Change-Id: I7b542d75575f6d8a5bcc08e85802dbd888c19766

7 years agoMerge "Add a warning message to the ASM toggle." into nyc-mr1-dev
TreeHugger Robot [Wed, 28 Sep 2016 18:34:29 +0000 (18:34 +0000)]
Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev

7 years agoMerge "Make icon size are the same in factory reset account list."
TreeHugger Robot [Wed, 28 Sep 2016 17:51:30 +0000 (17:51 +0000)]
Merge "Make icon size are the same in factory reset account list."

7 years agoMerge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into...
Steven Ng [Wed, 28 Sep 2016 17:07:20 +0000 (17:07 +0000)]
Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev am: 2f5ab90e70 am: 27fc8ed383
am: a2fb0055aa  -s ours

Change-Id: I9517d9cc4773c2c8578ba6c3707bdb88f392d687

7 years agoDO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc...
Steven Ng [Wed, 28 Sep 2016 17:07:14 +0000 (17:07 +0000)]
DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc am: a2c32a3b91
am: 2d83e3a357  -s ours

Change-Id: I4ee505b11ae0bfd56f7f608a4d32fbf735f2df57

7 years agoMerge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into...
Steven Ng [Wed, 28 Sep 2016 17:04:04 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev am: 2f5ab90e70
am: 27fc8ed383

Change-Id: Id769c6f609e2c5667a5b13e911d8543afb48cc04

7 years agoDO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc
Steven Ng [Wed, 28 Sep 2016 17:03:57 +0000 (17:03 +0000)]
DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc
am: a2c32a3b91

Change-Id: If52fe6c02e707465a074527221fbe851ad51085a

7 years agoMerge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into...
Steven Ng [Wed, 28 Sep 2016 17:01:30 +0000 (17:01 +0000)]
Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev
am: 2f5ab90e70

Change-Id: Ifcc5abd42137fb207f7bb588e41c0bcbbea5b243

7 years agoDO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent
Steven Ng [Wed, 28 Sep 2016 17:01:26 +0000 (17:01 +0000)]
DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent
am: da738b2edc

Change-Id: I74c02f4f9430ae8780b6a32e0c318174dce0c5c3

7 years agoMerge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into...
Steven Ng [Wed, 28 Sep 2016 16:55:52 +0000 (16:55 +0000)]
Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev

7 years agoMerge "Add talk back for regulatory info"
Lei Yu [Wed, 28 Sep 2016 16:44:17 +0000 (16:44 +0000)]
Merge "Add talk back for regulatory info"

7 years agoMake icon size are the same in factory reset account list.
Fan Zhang [Wed, 28 Sep 2016 16:07:44 +0000 (09:07 -0700)]
Make icon size are the same in factory reset account list.

Change-Id: I74779471a3fb7b99b515203ddba3aca6b0cd588b
Fix: 31791627
Test: Visual inspection

7 years agoMerge "Catch all data set changes"
Tony Mantler [Wed, 28 Sep 2016 15:54:45 +0000 (15:54 +0000)]
Merge "Catch all data set changes"

7 years agoDO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent
Steven Ng [Tue, 27 Sep 2016 22:31:45 +0000 (23:31 +0100)]
DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent

Cherry-pick from ag/1444396

1) Added a trampoline activity to display SET_NEW_PASSWORD intent.
2) On devices that have fingerprint sensor and have no enrolled fingerprint,
   ChooseLockGeneric handles the SET_NEW_PASSWORD intent by providing
   fingerprint + {PIN/PATTERN/PASSWORD} and skip fingerprint options.

Test: See below
1) Auto
   make RunSettingsRoboTests
2) Manual
   a) Fingerprint + pattern
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Pixel Imprint + Pattern.
      iii) Set a pattern lock.
      iv) Can enroll a fingerprint.
   b) Pattern
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Continue without Pixel Imprint
      iii) A list of unlock options, without fingerprint option, is shown.
      vi) Select and enroll a pattern lock
   c) Has an existing password
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Setting app asks for password input.
      iii) Enter password and click "Continue without Pixel imprint".
      vi) No password is asked. A list of unlock options, without fingerprint option, is shown.
      v) Select and enroll a pattern lock
   d) Work profile
      i) Create a work profile
      ii) adb shell am start --user x -a android.app.action.SET_NEW_PASSWORD. X is the work profile user id.
      iii) Click Pixel Imprint + Pattern.
      iv) Set a pattern lock.
      v) Can enroll a fingerprint.

Bug: 23017051
Change-Id: I6384bbffb72a5d3a83972da7474532746e4d06b9

7 years agoConnect button click handler for bluetooth forget dialog. am: f8c29641da am: e469371dac
Fan Zhang [Wed, 28 Sep 2016 02:04:26 +0000 (02:04 +0000)]
Connect button click handler for bluetooth forget dialog. am: f8c29641da am: e469371dac
am: c4a53b367e

Change-Id: Ie0968931c918718417948214b6ba7d54733c91cf

7 years agoConnect button click handler for bluetooth forget dialog. am: f8c29641da
Fan Zhang [Wed, 28 Sep 2016 02:01:04 +0000 (02:01 +0000)]
Connect button click handler for bluetooth forget dialog. am: f8c29641da
am: e469371dac

Change-Id: I442d8074737cbbfc788bb0f7be155119aad40d3b

7 years agoConnect button click handler for bluetooth forget dialog.
Fan Zhang [Wed, 28 Sep 2016 01:57:49 +0000 (01:57 +0000)]
Connect button click handler for bluetooth forget dialog.
am: f8c29641da

Change-Id: I2529056af5cfa947c85dcc6633bb2b4498ac9fa6

7 years agoMerge "Add feature provider for dashboard."
TreeHugger Robot [Wed, 28 Sep 2016 00:54:04 +0000 (00:54 +0000)]
Merge "Add feature provider for dashboard."

7 years agoAdd a warning message to the ASM toggle.
Daniel Nishi [Tue, 27 Sep 2016 22:59:42 +0000 (15:59 -0700)]
Add a warning message to the ASM toggle.

This trigger fires if ASM is not enabled by default for
the device and the toggle is only visible if the ASM visible
flag is enabled.

Bug: 30455784
Change-Id: Id6adf8a75dbd4290f042d743689a75f496efb0c9

7 years agoMerge "Fix robolectric tests"
TreeHugger Robot [Tue, 27 Sep 2016 23:25:33 +0000 (23:25 +0000)]
Merge "Fix robolectric tests"

7 years agoMerge "Fix cancel button behavior when setting data limit."
Stephen Chen [Tue, 27 Sep 2016 23:01:59 +0000 (23:01 +0000)]
Merge "Fix cancel button behavior when setting data limit."

7 years agoConnect button click handler for bluetooth forget dialog.
Fan Zhang [Tue, 27 Sep 2016 22:39:50 +0000 (15:39 -0700)]
Connect button click handler for bluetooth forget dialog.

Bug: 31761184
Test: manual
Change-Id: I48aac6899cb9a49bf988d3b9e6480dfd6fe0c1c2

7 years agoMerge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev am: efbe5ec924 am...
Salvador Martinez [Tue, 27 Sep 2016 22:02:16 +0000 (22:02 +0000)]
Merge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev am: efbe5ec924 am: bec304f4aa
am: b3d77264e1

Change-Id: I4f69b8b6470fe0d3de818d39ded544a463c19fca

7 years agoFixed talkback feedback for wifi menu am: 7c59e7ab53 am: ce18d5ea14
Salvador Martinez [Tue, 27 Sep 2016 22:02:02 +0000 (22:02 +0000)]
Fixed talkback feedback for wifi menu am: 7c59e7ab53 am: ce18d5ea14
am: 2b55d2f527

Change-Id: Ie120676376037c80df91ff3dc15b120fb1c9db5d

7 years agoMerge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev am: efbe5ec924
Salvador Martinez [Tue, 27 Sep 2016 21:59:52 +0000 (21:59 +0000)]
Merge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev am: efbe5ec924
am: bec304f4aa

Change-Id: I0a8c0348cfe6392ac82741da3740e648c01932bc

7 years agoFixed talkback feedback for wifi menu am: 7c59e7ab53
Salvador Martinez [Tue, 27 Sep 2016 21:59:34 +0000 (21:59 +0000)]
Fixed talkback feedback for wifi menu am: 7c59e7ab53
am: ce18d5ea14

Change-Id: I6f1fc0922cfab21da53219e560a46d94156e3533

7 years agoMerge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev
Salvador Martinez [Tue, 27 Sep 2016 21:56:33 +0000 (21:56 +0000)]
Merge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev
am: efbe5ec924

Change-Id: Ied648c479e0cb34bd08c620c36332cbbcc241056

7 years agoFixed talkback feedback for wifi menu
Salvador Martinez [Tue, 27 Sep 2016 21:56:32 +0000 (21:56 +0000)]
Fixed talkback feedback for wifi menu
am: 7c59e7ab53

Change-Id: Id2a839f71ce23520cef7e69ca13c4f5c587cf4a5

7 years agoMerge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev
Salvador Martinez [Tue, 27 Sep 2016 21:52:16 +0000 (21:52 +0000)]
Merge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev

7 years agoFixed talkback feedback for wifi menu
Salvador Martinez [Mon, 26 Sep 2016 22:43:00 +0000 (15:43 -0700)]
Fixed talkback feedback for wifi menu

When you go to add a existing or new access
point for wifi talkback would say the
incorrect thing when you tapped on the
advanced options dropdown menu toggle.
This fixes what talkback says to more
accurately reflect what the widget does.

Test: Accessibility Scanner
Bug: 31623421
Change-Id: I9a00c4e8723014b0b3097f046dbcd1de01636e76

7 years agoCatch all data set changes
Tony Mantler [Tue, 27 Sep 2016 21:48:16 +0000 (14:48 -0700)]
Catch all data set changes

Test: Toggle wifi in settings
b/31649262

Change-Id: I303206f3b977707528e98dfe227b49835edc78f2

7 years agoMerge "Provide fingerprint options for SET_NEW_PASSWORD intent"
Steven Ng [Tue, 27 Sep 2016 21:04:20 +0000 (21:04 +0000)]
Merge "Provide fingerprint options for SET_NEW_PASSWORD intent"

7 years agoSettings suggestions now describes expand and collapse in talkback
Matthew Fritze [Mon, 25 Jul 2016 21:34:47 +0000 (14:34 -0700)]
Settings suggestions now describes expand and collapse in talkback

Bug: 30314874
Change-Id: I2231148594c8e878111a754e5806c20dd4e289af

7 years agoFix cancel button behavior when setting data limit.
Stephen Chen [Mon, 26 Sep 2016 21:57:15 +0000 (14:57 -0700)]
Fix cancel button behavior when setting data limit.

Bug: 28563526
Change-Id: I574c4051bb19710409ca4cf4eeffef7be1a7d0ec
Fixes: 28563526
Test: make RunSettingsRoboTests

7 years agoFix robolectric tests
Fan Zhang [Tue, 27 Sep 2016 15:41:18 +0000 (08:41 -0700)]
Fix robolectric tests

Fix: 31751980
Test: make RunSettingsRoboTests
Change-Id: Id787665d7cb44ee8a0c6ff52927394de1c3e9efc

7 years agoMerge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev am: d76a3...
Chen Xu [Tue, 27 Sep 2016 18:53:35 +0000 (18:53 +0000)]
Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev am: d76a3ed937 am: 022ca70f4f
am: 65df5b4cdc

Change-Id: I7a4ef962ab8e9ca51e0f13cbf7c0c339adf4ac47

7 years agoAvoid run RadioInfo activity from non-system users am: b54cb2d18c am: a126537dc1
fionaxu [Tue, 27 Sep 2016 18:53:20 +0000 (18:53 +0000)]
Avoid run RadioInfo activity from non-system users am: b54cb2d18c am: a126537dc1
am: 2581719584

Change-Id: Ie8cd8ffcee12df54bb02f7d86e061f455651fdf8

7 years agoMerge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev am: d76a3...
Chen Xu [Tue, 27 Sep 2016 18:50:33 +0000 (18:50 +0000)]
Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev am: d76a3ed937
am: 022ca70f4f

Change-Id: I1f571dc0f44ef804267a5528c6d2176738519684

7 years agoAvoid run RadioInfo activity from non-system users am: b54cb2d18c
fionaxu [Tue, 27 Sep 2016 18:50:20 +0000 (18:50 +0000)]
Avoid run RadioInfo activity from non-system users am: b54cb2d18c
am: a126537dc1

Change-Id: I36d9fb28f4d341bd4c9d271bfc853f70f9852dd0

7 years agoMerge "Fix a deprecated config string name for the storage manager settings." into...
Daniel Nishi [Tue, 27 Sep 2016 18:47:55 +0000 (18:47 +0000)]
Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev am: 59d2b185f3 am: ff18b331df
am: a988138f14

Change-Id: Id000d2de0816e8898c6230f7a81aa36885ae5b0f

7 years agoMerge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev
Chen Xu [Tue, 27 Sep 2016 18:47:49 +0000 (18:47 +0000)]
Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev
am: d76a3ed937

Change-Id: Id25c4fd9c982f28412445b02e255589f9ede3ab1

7 years agoAvoid run RadioInfo activity from non-system users
fionaxu [Tue, 27 Sep 2016 18:47:49 +0000 (18:47 +0000)]
Avoid run RadioInfo activity from non-system users
am: b54cb2d18c

Change-Id: I17319eb628b19667fec7a6bba2f376322626bafc

7 years agoMerge "resolve merge conflicts of 2c826d7 to master"
TreeHugger Robot [Tue, 27 Sep 2016 18:46:15 +0000 (18:46 +0000)]
Merge "resolve merge conflicts of 2c826d7 to master"

7 years agoMerge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev
Chen Xu [Tue, 27 Sep 2016 18:38:18 +0000 (18:38 +0000)]
Merge "Avoid run RadioInfo activity from non-system users" into nyc-mr1-dev