OSDN Git Service
Doris Ling [Fri, 23 Sep 2016 22:07:04 +0000 (22:07 +0000)]
Use default switch preference view if gesture animations video is not available. am:
08886a0e91 am:
38693095e3
am:
7c8de075d8
Change-Id: Icd2dd9b1f58c0957d651742dab16b291afcd750c
Lei Yu [Fri, 23 Sep 2016 22:06:46 +0000 (22:06 +0000)]
Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev am:
a985425e98 am:
8497e0d2dd
am:
8fe8f02245
Change-Id: Ic415c1e10591179fc6d94e8e8c3dc5c705a5584d
jackqdyulei [Fri, 23 Sep 2016 22:06:32 +0000 (22:06 +0000)]
Set preference unselectable using the DividerPreference. am:
64e00da860 am:
33c2f0d150
am:
3f428f1ca9
Change-Id: I7c0c484486cfb462420578ec1a5edf5529259f9f
Annie Chin [Fri, 23 Sep 2016 22:06:10 +0000 (22:06 +0000)]
Merge "Change 'red' to 'amber'" into nyc-mr1-dev am:
0ae282b26e am:
b2d199abd9
am:
34f4aa9119
Change-Id: Ia2e96827f6ee02d8e8858a9abb769efa17103e3e
Annie Chin [Fri, 23 Sep 2016 22:05:52 +0000 (22:05 +0000)]
Change 'red' to 'amber' am:
f980a1239c am:
e1ffa85984
am:
30dbecc7bc
Change-Id: If32f29086f59c7a216e27636e91105196f58359e
Chris Tate [Fri, 23 Sep 2016 22:05:27 +0000 (22:05 +0000)]
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev am:
4199a0d3bd am:
53cc21d189
am:
9c4bad92b1
Change-Id: I7124e170ae09482750ffc28bbd047fb2b16696c0
Android Build Merger (Role) [Fri, 23 Sep 2016 21:46:30 +0000 (21:46 +0000)]
Merge "Tell sublaunched backup settings activities about policy state am:
ee564e9cfc am:
8953a28597 am:
d35a29884b"
Christopher Tate [Fri, 23 Sep 2016 21:45:12 +0000 (21:45 +0000)]
Tell sublaunched backup settings activities about policy state am:
ee564e9cfc am:
8953a28597
am:
d35a29884b
Change-Id: I350bcabcef6702ae9b12b81767afc504031998ad
Fan Zhang [Fri, 23 Sep 2016 19:10:38 +0000 (12:10 -0700)]
Add metrics for remaining dialogs in settings.
Fix:
31707295
Test: make RunSettingRoboTests
Test: verify logs
Change-Id: Icf70900ac4472195624d14e9172207a5c85dccca
Doris Ling [Fri, 23 Sep 2016 19:10:06 +0000 (19:10 +0000)]
Use default switch preference view if gesture animations video is not available. am:
08886a0e91
am:
38693095e3
Change-Id: I460835a7e0ba3737e530ae24f6a957ed5ac1e742
Doris Ling [Fri, 23 Sep 2016 19:07:19 +0000 (19:07 +0000)]
Use default switch preference view if gesture animations video is not available.
am:
08886a0e91
Change-Id: I813a7b61b49c593d639621194d1e0929a2322605
Lei Yu [Fri, 23 Sep 2016 16:37:11 +0000 (16:37 +0000)]
Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev am:
a985425e98
am:
8497e0d2dd
Change-Id: I609c2a719ac9dd746876031c7e811736b285bfb6
jackqdyulei [Fri, 23 Sep 2016 16:36:57 +0000 (16:36 +0000)]
Set preference unselectable using the DividerPreference. am:
64e00da860
am:
33c2f0d150
Change-Id: I92fca298aa8e6cc1632022049a1cb95883c41d6b
Lei Yu [Fri, 23 Sep 2016 16:34:55 +0000 (16:34 +0000)]
Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev
am:
a985425e98
Change-Id: I63577db8f2ca7c8eea0a2b3b7220c4db4d5bf76f
jackqdyulei [Fri, 23 Sep 2016 16:34:54 +0000 (16:34 +0000)]
Set preference unselectable using the DividerPreference.
am:
64e00da860
Change-Id: Ie202ee30067761ca7025ff37c3779052c48cacd5
Lei Yu [Fri, 23 Sep 2016 16:29:00 +0000 (16:29 +0000)]
Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev
Fan Zhang [Thu, 22 Sep 2016 17:43:12 +0000 (10:43 -0700)]
Use MetricsFeatureProvider for logging in Settings.
Bug:
31664539
Test: make RunSettingsRoboTests for regression
Test: adb logcat -b events | egrep "(sysui_|notification_)" for
verifying log
Change-Id: Id944be7c4ff9911aebee481c2df485542f1318f0
Todd Kennedy [Fri, 23 Sep 2016 01:54:32 +0000 (01:54 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev am:
727186bd33 am:
184524b37d
am:
33a08271c5
Change-Id: Icb2b5c2ecfe0c8446fd60e430d2b5889afc632f3
Annie Chin [Fri, 23 Sep 2016 00:26:12 +0000 (00:26 +0000)]
Merge "Change 'red' to 'amber'" into nyc-mr1-dev am:
0ae282b26e
am:
b2d199abd9
Change-Id: I5b4a8351e39f06f41c21671c497515a9107c6e8f
Annie Chin [Fri, 23 Sep 2016 00:25:57 +0000 (00:25 +0000)]
Change 'red' to 'amber' am:
f980a1239c
am:
e1ffa85984
Change-Id: If6d2a1998719c4aa008e669ae8d423541ff312eb
Chris Tate [Fri, 23 Sep 2016 00:25:42 +0000 (00:25 +0000)]
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev am:
4199a0d3bd
am:
53cc21d189
Change-Id: I173f1e085bda6eb3a0f98dd3c2259e6301c5d398
Annie Chin [Fri, 23 Sep 2016 00:21:16 +0000 (00:21 +0000)]
Merge "Change 'red' to 'amber'" into nyc-mr1-dev
am:
0ae282b26e
Change-Id: I869ecadaf6cc42d076f1d6368f64ef6e0d521bca
Annie Chin [Fri, 23 Sep 2016 00:21:15 +0000 (00:21 +0000)]
Change 'red' to 'amber'
am:
f980a1239c
Change-Id: I8c55a1cc67024be79922e9f931ea8e631a790615
TreeHugger Robot [Fri, 23 Sep 2016 00:11:07 +0000 (00:11 +0000)]
Merge "Change 'red' to 'amber'" into nyc-mr1-dev
Christopher Tate [Thu, 22 Sep 2016 23:57:32 +0000 (23:57 +0000)]
Tell sublaunched backup settings activities about policy state am:
ee564e9cfc
am:
8953a28597
Change-Id: Ia3742c49903b95737b6559f69ffe2c6d65a85e0e
TreeHugger Robot [Thu, 22 Sep 2016 23:56:28 +0000 (23:56 +0000)]
Merge "Use MetricsFeatureProvider for condition/suggestion/search."
Todd Kennedy [Thu, 22 Sep 2016 23:35:31 +0000 (23:35 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev am:
727186bd33
am:
184524b37d
Change-Id: I13fba175e96ea9edcdd02d717bc768b913777240
Chris Tate [Thu, 22 Sep 2016 23:31:21 +0000 (23:31 +0000)]
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev
am:
4199a0d3bd
Change-Id: I64ccf414058dcd3488b1f5c6c32b2ca62791f778
Todd Kennedy [Thu, 22 Sep 2016 23:29:08 +0000 (23:29 +0000)]
Add remote control of Instant Apps am:
6ed0c7e8d7 am:
d95430cbe6
am:
212eb25768
Change-Id: Id1321667de7ca2b400c06a61a20ba10239697531
Bill Yi [Thu, 22 Sep 2016 23:28:42 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
b8f9eca6b2 -s ours am:
6733fd04d9 -s ours am:
e4591a6295 -s ours
am:
2a7e6aa6a7 -s ours
Change-Id: I1870f2ee18e835a3758df95b3105cb987c4daec2
Bill Yi [Thu, 22 Sep 2016 23:28:25 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
4702b22ed5 -s ours am:
11a58be734 -s ours
am:
4097006da3 -s ours
Change-Id: I4a3e09357122f67acb3a1021653faa58ccee9955
Christopher Tate [Thu, 22 Sep 2016 23:08:31 +0000 (23:08 +0000)]
Tell sublaunched backup settings activities about policy state
am:
ee564e9cfc
Change-Id: Ia2e6482ce141ce6cc31ecd501e321b8f5454721f
Todd Kennedy [Thu, 22 Sep 2016 22:55:33 +0000 (22:55 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
am:
727186bd33
Change-Id: Ib4e109f9780fd71c48fdd751b489ff22916864c3
Chris Tate [Thu, 22 Sep 2016 21:58:27 +0000 (21:58 +0000)]
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev
Todd Kennedy [Thu, 22 Sep 2016 21:58:04 +0000 (21:58 +0000)]
Add remote control of Instant Apps am:
6ed0c7e8d7
am:
d95430cbe6
Change-Id: I3a052aeb59f608d21a3be43691128e2b7acd56a4
Bill Yi [Thu, 22 Sep 2016 21:57:23 +0000 (21:57 +0000)]
Import translations. DO NOT MERGE am:
b8f9eca6b2 -s ours am:
6733fd04d9 -s ours
am:
e4591a6295 -s ours
Change-Id: Iee4085c0c96e98888b0b7fbd9396d3ff87c5c6e6
Bill Yi [Thu, 22 Sep 2016 21:57:06 +0000 (21:57 +0000)]
Import translations. DO NOT MERGE am:
4702b22ed5 -s ours
am:
11a58be734 -s ours
Change-Id: I1f99970be73359f9bd61ecfa976286581ac39d67
Stephen Chen [Tue, 20 Sep 2016 20:15:11 +0000 (13:15 -0700)]
Change Display summary to sleep timeout description.
Bug:
29579542
Fixes:
29579542
Change-Id: I4e122bd6972fde933229768cba86302eb4d3f7c6
Test: Added Robo test, manually tested
TreeHugger Robot [Thu, 22 Sep 2016 20:31:57 +0000 (20:31 +0000)]
Merge "Fix compile error when robotests references R.* in Settings"
Fan Zhang [Thu, 22 Sep 2016 00:01:39 +0000 (17:01 -0700)]
Use MetricsFeatureProvider for condition/suggestion/search.
Bug:
31664539
Test: make RunSettingsRoboTests
This allows different metric clients to listen to these events.
Change-Id: Ib19c8099b16ff78d9aa4901278e0ff33eeefd4a8
Todd Kennedy [Thu, 22 Sep 2016 20:01:03 +0000 (20:01 +0000)]
Add remote control of Instant Apps
am:
6ed0c7e8d7
Change-Id: If24fd101fbc4815f1eb3875fdb1216c7cee39b4b
Bill Yi [Thu, 22 Sep 2016 19:59:25 +0000 (19:59 +0000)]
Import translations. DO NOT MERGE am:
b8f9eca6b2 -s ours
am:
6733fd04d9 -s ours
Change-Id: I865142acdd2fae0fb886a4796f0ad15a9fc4d984
Bill Yi [Thu, 22 Sep 2016 19:58:29 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am:
4702b22ed5 -s ours
Change-Id: I8a8a675809d8ae335f43d58ba1e83443676fd8e4
jackqdyulei [Wed, 31 Aug 2016 21:17:26 +0000 (14:17 -0700)]
Set preference unselectable using the DividerPreference.
In this way, when talking back is on, device won't speaking "Double
tap to activate" for no-action perference. The preference will have
divider line but lose ripple animation.
Bug:
31051833
Test: Manual Test. Cannot find a way to test it in testing framework.
1. Turn on the talk back.
2. Go to "About phone" Settings.
3. Tap and listen.
Change-Id: I2066d574e14071408c5a1db85a3bd4dafd8429fe
Fan Zhang [Thu, 22 Sep 2016 17:54:15 +0000 (10:54 -0700)]
Fix compile error when robotests references R.* in Settings
Test: make SettingsRoboTests
Change-Id: I85c8bb1b83fa9d1f487658b1bc5dc080f70efa2f
Fan Zhang [Thu, 22 Sep 2016 17:04:40 +0000 (10:04 -0700)]
Use MetricsFeatureProvider in storage manager fragment.
Bug:
31664539
Test: make RunSettingsRoboTests for regression
Test: adb logcat -b events | egrep "(sysui_|notification_)" for
verifying log
Change-Id: I65743b87fdf6f010e40ca705e33e18642e0bfca3
Annie Chin [Thu, 22 Sep 2016 17:26:06 +0000 (10:26 -0700)]
Change 'red' to 'amber'
Change-Id: I36e4815165a12d33ce4aaad446acae19897be138
Fixes:
31628145
TreeHugger Robot [Thu, 22 Sep 2016 16:57:11 +0000 (16:57 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 15:26:26 +0000 (15:26 +0000)]
Merge "Remove delay from interactive bugreport."
Svetoslav Ganov [Thu, 22 Sep 2016 14:56:21 +0000 (14:56 +0000)]
Merge "Update text of WiFi toggle prompt buttons"
Svet Ganov [Thu, 22 Sep 2016 14:50:39 +0000 (07:50 -0700)]
Update text of WiFi toggle prompt buttons
Change-Id: Ia9d9a44cddc72fb61b80393e61586e7a4f9801d6
Bill Yi [Thu, 22 Sep 2016 12:38:46 +0000 (12:38 +0000)]
Import translations. DO NOT MERGE
am:
b8f9eca6b2 -s ours
Change-Id: I6fe66119ad608719c03ff091e1ee04f032312788
TreeHugger Robot [Thu, 22 Sep 2016 11:01:05 +0000 (11:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 22 Sep 2016 09:12:45 +0000 (02:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f9f1416177c094f377745c6b23e878b257ccaa9
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Sep 2016 09:07:48 +0000 (02:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I536498782053bf9372ecc8c59c8f20727658a8ad
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Sep 2016 09:02:33 +0000 (02:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9bb06a317297ac9da28b3d462194211759c73172
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 22 Sep 2016 01:34:46 +0000 (01:34 +0000)]
Merge "Log visibility change for DialogCreatable in Settings."
Christopher Tate [Thu, 22 Sep 2016 00:16:17 +0000 (17:16 -0700)]
Tell sublaunched backup settings activities about policy state
Policy state is not readily observable by subsidiary UI, so we
now tell it explicitly when sublaunching it.
Bug
30126678
Change-Id: Icdd6e39874070d7337b4b0a0d5b80c52bb3e7e40
Fan Zhang [Tue, 20 Sep 2016 00:45:24 +0000 (17:45 -0700)]
Log visibility change for DialogCreatable in Settings.
Bug:
30681529
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Test: make RunSettingsRoboTests
Change-Id: I51754d258ba1ddfae24323681f21cd02de4dbb4e
Bill Yi [Wed, 21 Sep 2016 19:54:07 +0000 (19:54 +0000)]
Import translations. DO NOT MERGE am:
7eeb016fdd -s ours am:
4d83805999 -s ours am:
cacface139 -s ours
am:
5917b78ca0 -s ours
Change-Id: I32047d7b46f341fa3cb73b8333cf152ad29615fe
Bill Yi [Wed, 21 Sep 2016 19:30:50 +0000 (19:30 +0000)]
Import translations. DO NOT MERGE am:
7eeb016fdd -s ours am:
4d83805999 -s ours
am:
cacface139 -s ours
Change-Id: I24531365603dbf93fcfb07318d6de5e208b67cc1
Bill Yi [Wed, 21 Sep 2016 19:28:18 +0000 (19:28 +0000)]
Import translations. DO NOT MERGE am:
7eeb016fdd -s ours
am:
4d83805999 -s ours
Change-Id: I04ef038f38034999a033f44f4c8a9f926143fd26
Bill Yi [Wed, 21 Sep 2016 19:25:17 +0000 (19:25 +0000)]
Import translations. DO NOT MERGE
am:
7eeb016fdd -s ours
Change-Id: I0c3faa0ad6760b35f3a7eb8d85d0908228297b8d
Bill Yi [Wed, 21 Sep 2016 19:10:51 +0000 (12:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
31075769
Change-Id: I12e44f90e46c8f42290b7210556b52ecabcf769e
Amit Mahajan [Wed, 21 Sep 2016 18:52:05 +0000 (18:52 +0000)]
Changes to make APN fields uneditable based on carrier config. am:
7c01344349 am:
f3f35a9b1e
am:
69b9c2f04c
Change-Id: I0ed7c050c66594cb91907c99432b12324903934a
Philip P. Moltmann [Wed, 21 Sep 2016 18:14:21 +0000 (18:14 +0000)]
Merge "USB restriction is similar to media restriction"
Felipe Leme [Wed, 21 Sep 2016 17:20:57 +0000 (10:20 -0700)]
Remove delay from interactive bugreport.
The delay was useful when the interactive bugreport took an initial
screenshot, which is not the case anymore.
BUG:
30429546
Test: manual
Change-Id: I648db4e1acdea3aa89df9205148cac43880763be
Matthew Fritze [Wed, 21 Sep 2016 16:12:19 +0000 (16:12 +0000)]
Merge "Update Robolectric tests to use google truth"
Lorenzo Colitti [Wed, 21 Sep 2016 07:40:37 +0000 (07:40 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev am:
2c7c84a1cd am:
f6e03921f8 am:
f491f48f3c
am:
3c381aec93
Change-Id: If4a1f4f1feaf71137ba0fdb5787285ae314e0c8d
Lorenzo Colitti [Wed, 21 Sep 2016 06:07:59 +0000 (06:07 +0000)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog. am:
c179f33c87 am:
bd1936e9e9 am:
f6a0fda0e5
am:
c2dd47e331
Change-Id: I363d6dc94add9c0ab0f13a26626010a386d8373a
Amit Mahajan [Wed, 21 Sep 2016 02:24:38 +0000 (02:24 +0000)]
Changes to make APN fields uneditable based on carrier config. am:
7c01344349
am:
f3f35a9b1e
Change-Id: I18e4e4c557d61eb0209a848ed8b2891a7107bc11
Amit Mahajan [Wed, 21 Sep 2016 02:11:50 +0000 (02:11 +0000)]
Changes to make APN fields uneditable based on carrier config.
am:
7c01344349
Change-Id: Idf1b11ac139c63abc3e1d819c98cbe664fa60f04
Doris Ling [Fri, 16 Sep 2016 23:58:02 +0000 (16:58 -0700)]
Use default switch preference view if gesture animations video is not
available.
Check to see if animation video is available. If so, use the customized
view. Otherwise, use the default switch preference layout.
Test: make and run SettingsGoogleTests
Bug:
30701118
Change-Id: I0b25f41f8425b92834b45f706690648fb35a885d
Amit Mahajan [Tue, 20 Sep 2016 17:59:16 +0000 (10:59 -0700)]
Changes to make APN fields uneditable based on carrier config.
Bug:
30457714
Change-Id: I682445eab8eb3ff4ff3eaf036964b467217366f0
TreeHugger Robot [Tue, 20 Sep 2016 18:20:10 +0000 (18:20 +0000)]
Merge "Fix NPE when using VisibilityLogger."
Lorenzo Colitti [Tue, 20 Sep 2016 17:45:41 +0000 (17:45 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev am:
2c7c84a1cd am:
f6e03921f8
am:
f491f48f3c
Change-Id: I181ee52b3baa28a3a0464c6599d9e30fddbca8fe
Lorenzo Colitti [Tue, 20 Sep 2016 17:42:21 +0000 (17:42 +0000)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog. am:
c179f33c87 am:
bd1936e9e9
am:
f6a0fda0e5
Change-Id: I6b53930533f9551e77100dba39e150735a09a3ba
Lorenzo Colitti [Tue, 20 Sep 2016 17:32:55 +0000 (17:32 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev am:
2c7c84a1cd
am:
f6e03921f8
Change-Id: Ieb199e467454078e169bb03753acd35be244ad7f
Lorenzo Colitti [Tue, 20 Sep 2016 17:27:26 +0000 (17:27 +0000)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog. am:
c179f33c87
am:
bd1936e9e9
Change-Id: Ieab1f57e8ded33a0b3672d47ab8b03995cb35c86
Lorenzo Colitti [Tue, 20 Sep 2016 17:24:59 +0000 (17:24 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev
am:
2c7c84a1cd
Change-Id: Ie98b23d5d81afffcd02fee7339dbe50172a194ae
Lorenzo Colitti [Tue, 20 Sep 2016 17:16:12 +0000 (17:16 +0000)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog.
am:
c179f33c87
Change-Id: Ia46300f122a19cf00f81b1f1115d8981f53fc7d9
Lorenzo Colitti [Tue, 20 Sep 2016 17:04:37 +0000 (17:04 +0000)]
Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev
TreeHugger Robot [Tue, 20 Sep 2016 16:30:13 +0000 (16:30 +0000)]
Merge "Clean up string description for NFC disclaimer dialog."
Fan Zhang [Tue, 20 Sep 2016 16:05:27 +0000 (09:05 -0700)]
Fix NPE when using VisibilityLogger.
Fix:
31612160
Test: make RunSettingsRoboTests
Change-Id: Ib040a40d27a76d9440f629ed4f768dc4bfde8ac2
TreeHugger Robot [Tue, 20 Sep 2016 15:55:39 +0000 (15:55 +0000)]
Merge "Add visibility metrics to dialogs."
Bill Yi [Tue, 20 Sep 2016 07:07:50 +0000 (07:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a365d9123c -s ours am:
8469c01294 -s ours
am:
f3154c6763 -s ours
Change-Id: Ie909ff8d5138e71f5d2514f0f017dd135e2c1dc8
Bill Yi [Tue, 20 Sep 2016 07:07:29 +0000 (07:07 +0000)]
Import translations. DO NOT MERGE am:
a860e80b92 -s ours am:
9cc0e28204 -s ours
am:
4ebeaf09fd -s ours
Change-Id: I1d6a5a7cacc3d8d8b769c51025a72ca7a06b3cff
Bill Yi [Tue, 20 Sep 2016 07:07:06 +0000 (07:07 +0000)]
Import translations. DO NOT MERGE am:
225c634f99 -s ours am:
41e378d12c -s ours am:
9b33478680 -s ours am:
e281868348 -s ours
am:
821890c1ac -s ours
Change-Id: I7523089878a408614fbd6778d676444ed35f7b3c
Bill Yi [Tue, 20 Sep 2016 07:06:48 +0000 (07:06 +0000)]
Import translations. DO NOT MERGE am:
225c634f99 -s ours am:
9506876a5f -s ours
am:
cb2f7d4dcd -s ours
Change-Id: Ie0908c1965991bbff6931355a4b896215aacfdd5
Bill Yi [Tue, 20 Sep 2016 07:06:28 +0000 (07:06 +0000)]
Import translations. DO NOT MERGE am:
82eff79103 -s ours am:
69ca405545 -s ours am:
4f2e73cd62 -s ours
am:
b828cfe04b -s ours
Change-Id: I75f25db8ba00551af2eb41c5a2ec3e70ae3fb4ed
Amit Mahajan [Tue, 20 Sep 2016 07:06:08 +0000 (07:06 +0000)]
Merge "Changes to support read-only apn types." into nyc-mr1-dev am:
9887baecf3 am:
cd49d13266
am:
eb8b2b1050
Change-Id: I902412ca2cff7a2aa4bf3a86211103b6810254c7
Lorenzo Colitti [Sun, 18 Sep 2016 16:08:07 +0000 (01:08 +0900)]
Add a "Don't ask again" checkbox to the avoid bad wifi dialog.
Also update the settings code to reflect the new tristate
semantics of the NETWORK_AVOID_BAD_WIFI setting.
Bug:
31075769
Change-Id: Icd21d8272abe6afd42ee8a41e2c7e1a6af77f0b3
Fan Zhang [Fri, 16 Sep 2016 19:45:07 +0000 (12:45 -0700)]
Add visibility metrics to dialogs.
Bug:
30681529
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Change-Id: I199d2e1b2cb8588a562b46bb8128d8ece24952f0
Amin Shaikh [Mon, 19 Sep 2016 21:59:40 +0000 (21:59 +0000)]
Merge "Test for wallpaper preference layout crash."
TreeHugger Robot [Mon, 19 Sep 2016 21:24:32 +0000 (21:24 +0000)]
Merge "resolve merge conflicts of
66a8895 to master"
Daniel Nishi [Mon, 19 Sep 2016 20:36:02 +0000 (20:36 +0000)]
Merge "Use a config flag instead of a RO flag for showing Manage Storage."
TreeHugger Robot [Mon, 19 Sep 2016 20:26:14 +0000 (20:26 +0000)]
Merge "Add tests for data warning related classes."
Fan Zhang [Mon, 19 Sep 2016 19:17:04 +0000 (12:17 -0700)]
Clean up string description for NFC disclaimer dialog.
Bug:
30852261
Bug:
30860218
Test: manual build
Change-Id: I7be1e5ac0bf2a044efe6820a3cf011dc32ebc14b
Matthew Fritze [Fri, 16 Sep 2016 18:14:33 +0000 (11:14 -0700)]
Update Robolectric tests to use google truth
Bug:
31545801
Test: make RunSettingsRoboTests
Change-Id: Idb801d51b6a4dc02ea062bc32086e1a8fc28b94b
Bill Yi [Mon, 19 Sep 2016 18:40:56 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a365d9123c -s ours
am:
8469c01294 -s ours
Change-Id: I46a013fa04395eb805c3a451788b981f553b520f
OSDN Git Service
