OSDN Git Service
TreeHugger Robot [Wed, 9 Aug 2017 00:46:57 +0000 (00:46 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 22:13:13 +0000 (22:13 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
Salvador Martinez [Tue, 8 Aug 2017 21:53:54 +0000 (21:53 +0000)]
Refactor tether logic for reuse
am:
135619d483 -s ours
Change-Id: I5b00c372d02e86dc683c49e1142167316613f96f
Eric Schwarzenbach [Tue, 8 Aug 2017 21:11:51 +0000 (14:11 -0700)]
Add modify string to resources.
Bug:
36483704
Test: n/a
Change-Id: I8c68e11a7bbaff98e6384713dea69ef34bf46d01
Daniel Nishi [Tue, 8 Aug 2017 20:46:50 +0000 (20:46 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 20:02:42 +0000 (20:02 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Add new strings for b/
63109928" into oc-mr1-dev
Salvador Martinez [Mon, 7 Aug 2017 17:22:37 +0000 (10:22 -0700)]
Refactor tether logic for reuse
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug:
64092292
Change-Id: If8191698023d1da90db99b518d9f770683b5c789
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
TreeHugger Robot [Tue, 8 Aug 2017 19:22:50 +0000 (19:22 +0000)]
Merge "Add uid data even though on battery stats" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Refactor tether logic for reuse" into oc-mr1-dev
Daniel Nishi [Thu, 27 Jul 2017 18:06:41 +0000 (11:06 -0700)]
Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I0791bdddf0bc97abc21cd27613998247b11d7bb4
Alison Cichowlas [Tue, 8 Aug 2017 15:05:23 +0000 (11:05 -0400)]
Add new strings for b/
63109928
Test: Strings only; manual
Bug:
63109928
Change-Id: Ib2d491aff81faa866300e6b4f3a0d7c0e1417b98
Salvador Martinez [Tue, 8 Aug 2017 03:04:45 +0000 (03:04 +0000)]
Refactor permissions code for bluetooth controller enabler
am:
a8db5ccea8
Change-Id: I6288cf595419229f58abb396cbe9b6cf6e2c5fc4
Salvador Martinez [Thu, 3 Aug 2017 20:56:10 +0000 (13:56 -0700)]
Refactor permissions code for bluetooth controller enabler
Bluetooth may be disabled for a user. This CL refactors the code
that determines this a bit so we can query that without having to
have the UI open.
Test: robotests still pass
Bug:
62022517
Change-Id: Ic0837d21bdc4007a20d6ad138753d4f5d37ceceb
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
Salvador Martinez [Mon, 7 Aug 2017 17:22:37 +0000 (10:22 -0700)]
Refactor tether logic for reuse
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug:
64092292
Change-Id: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
TreeHugger Robot [Mon, 7 Aug 2017 22:58:33 +0000 (22:58 +0000)]
Merge "Revoke invidivual permissions" into oc-mr1-dev
jackqdyulei [Wed, 26 Jul 2017 20:14:46 +0000 (13:14 -0700)]
Add uid data even though on battery stats
Advacned battery page doesn't show background toggle because it
doesn't get uid from battery stats. This cl make it get uid by
package name even though without battery stats.
Bug:
64049162
Test: RunSettingsRoboTests
Change-Id: Ie0f67ce9d080c02763a8382740e0640a66ce6053
TreeHugger Robot [Mon, 7 Aug 2017 20:08:31 +0000 (20:08 +0000)]
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
Philip P. Moltmann [Wed, 2 Aug 2017 23:40:40 +0000 (16:40 -0700)]
Revoke invidivual permissions
The permission->group mapping is not guaranteed to be stable.
Bug:
64301150
Test: Manually
Change-Id: I44ec5964c01d22d615a9a4717eecabd406392752
TreeHugger Robot [Mon, 7 Aug 2017 17:16:06 +0000 (17:16 +0000)]
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 17:08:49 +0000 (10:08 -0700)]
wifi: WifiConfigController: fix possible NPE in showSecurityFields
Bug:
64438040
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I2ddc5c07a3c95cba91cef532dc2c84529146d100
Matthew Fritze [Mon, 7 Aug 2017 17:03:14 +0000 (17:03 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
am:
4f0e5f8395 -s ours
Change-Id: I888297c779795ad7489be0e7238d2bc5d673610e
TreeHugger Robot [Mon, 7 Aug 2017 16:53:29 +0000 (16:53 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
Beverly [Fri, 4 Aug 2017 17:41:23 +0000 (13:41 -0400)]
Uninstall app through notif closes app settings.
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes:
62051546
Test: manual
Matthew Fritze [Tue, 1 Aug 2017 00:16:27 +0000 (17:16 -0700)]
Expose Location toggling logic
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.
Test: robotests
Bug:
62022517
Change-Id: I519fad6d802efd8af2e77c623f698e19d4cdc800
TreeHugger Robot [Sun, 6 Aug 2017 20:46:27 +0000 (20:46 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
Bill Yi [Sun, 6 Aug 2017 02:27:58 +0000 (19:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2383afbd653fa9e3a1ed0e469bdbd891868f992e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Sat, 5 Aug 2017 05:32:42 +0000 (05:32 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am:
8f54cd46ff -s ours
Change-Id: I42d026677b6ca61de451a590b938605e79c1832c
TreeHugger Robot [Sat, 5 Aug 2017 05:20:42 +0000 (05:20 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
Bill Yi [Sat, 5 Aug 2017 02:49:27 +0000 (02:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
26e4fda3f2 -s ours
Change-Id: I8bc54083c553844ec2c8a65858f4b305fa30cf82
TreeHugger Robot [Sat, 5 Aug 2017 02:37:34 +0000 (02:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Meng Wang [Sat, 5 Aug 2017 00:04:44 +0000 (00:04 +0000)]
RadioInfo: fix OMADM buttons
am:
d4e0fe7f93
Change-Id: I401b5c686d184124cf97edfa332dacb301454e27
Bill Yi [Sat, 5 Aug 2017 00:04:36 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b239876604bd4f172b8b7af2e0d9307f6b2217d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Thu, 3 Aug 2017 17:54:48 +0000 (10:54 -0700)]
Fix crash when dismissing suggestions.
When the suggestions are in default mode and the number of suggestions
are more than the default count, we set the sublist of the suggestions
list as the suggestion adapter data. In this case, operation on the
suggestions list should be done in the sublist instead of the original
list to maintain the list consistency check.
Hence, when dismissing the suggestion, change to remove the suggestion
from the sugestion adapter instead of from the dashboard adapter, so
that any following interaction with the suggestions will not trigger the
concurrent modification exception.
Change-Id: I4caba74cfcc7bd0d53ad8c7dffcb127b3ebd845d
Merged-In: I970b6af8a1c72bc0c3ee89fef890ae6a669c71d2
Fix:
64279080
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 4 Aug 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Add support for carrier wifi in UI." into oc-mr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 22:36:57 +0000 (22:36 +0000)]
Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 20:50:26 +0000 (20:50 +0000)]
Merge "Move a11y indexing from DynamicContentMonitor to loader" into oc-mr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 20:16:36 +0000 (20:16 +0000)]
Merge "Misc tweaks in settings" into oc-mr1-dev
Doris Ling [Fri, 4 Aug 2017 20:09:07 +0000 (20:09 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-mr1-dev
Matthew Fritze [Mon, 31 Jul 2017 15:18:20 +0000 (08:18 -0700)]
Add INTENT_ONLY as a ResultPayload Availibility
Manual merge after a merge conflict.
Test: robotests
Bug:
64165583
Change-Id: I6eab018dc4065ceefdba2039a5842945e2f76a75
Fan Zhang [Fri, 4 Aug 2017 00:55:00 +0000 (17:55 -0700)]
Clean up logic for dismissing suggestion
We no longer bring suggestions back after dismissing, so some logic is
no longer necessary.
Change-Id: I9d931fbbbc79bade191bebf6d057870d088a5fde
Fixes:
64297191
Test: robotests
Fan Zhang [Thu, 3 Aug 2017 17:48:43 +0000 (10:48 -0700)]
Misc tweaks in settings
- Tweak layout for default sms picker icon. Now icons are aligned
and forced to be in the same size
- Update string to use correct double-quote symbol
- Multiline title for some user & account setting
Change-Id: I27c1ed6459c5cd919778d535ab846b148a3f91b6
Fixes:
64285520
Fixes:
62891178
Fixes:
62265094
Fixes:
64363209
Test: robotests
Test: visual
Matthew Fritze [Tue, 1 Aug 2017 00:16:27 +0000 (17:16 -0700)]
Expose Location toggling logic
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.
Test: robotests
Bug:
62022517
Change-Id: Ie6f4b7ce8a4024b86ba42971c5e3e24d1fd95ac6
Merged-In: I519fad6d802efd8af2e77c623f698e19d4cdc800
Tadashi G. Takaoka [Fri, 4 Aug 2017 04:11:42 +0000 (04:11 +0000)]
Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 03:05:21 +0000 (03:05 +0000)]
Merge "In the “Data usage” subtext, remove the word “between”." into oc-mr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 02:31:41 +0000 (02:31 +0000)]
Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev
Meng Wang [Thu, 3 Aug 2017 21:34:35 +0000 (14:34 -0700)]
RadioInfo: fix OMADM buttons
1. Use activity context instead of application context to send broadcast
- the activity is in phone process
2. Fix the target receiver component name
3. Remove receiver permission restrict since it's explict broadcast
Bug:
37993019
Test: manual
Change-Id: I8cf0772f4bb51617c2164aa530daaa4fdec117d2
Fan Zhang [Thu, 3 Aug 2017 20:04:28 +0000 (13:04 -0700)]
Misc tweak on wifi hotspot setting page
- Make hotspot password show in plain text
- Make main control into a master switch style
Change-Id: I8fdb293a617787f256fb663708cfc0e454f548d2
Fixes:
63865785
Test: robotests
Meng Wang [Thu, 3 Aug 2017 21:34:35 +0000 (14:34 -0700)]
RadioInfo: fix OMADM buttons
1. Use activity context instead of application context to send broadcast
- the activity is in phone process
2. Fix the target receiver component name
3. Remove receiver permission restrict since it's explict broadcast
Bug:
37993019
Test: manual
Change-Id: I8cf0772f4bb51617c2164aa530daaa4fdec117d2
Doris Ling [Thu, 3 Aug 2017 22:12:36 +0000 (15:12 -0700)]
Fix crash when dismissing suggestions.
When the suggestions are in default mode and the number of suggestions
are more than the default count, we set the sublist of the suggestions
list as the suggestion adapter data. In this case, operation on the list
should be done in the sublist instead of the original list to maintain
the list consistency check.
Hence, when dismissing the suggestion, change to remove the suggestion
from the suggestion adapter instead of from the dashboard adapter, so
that any following interaction with the suggestions will not trigger the
concurrent modification exception.
Bug:
64279080
Test: make RunSettingsRoboTests
Change-Id: I970b6af8a1c72bc0c3ee89fef890ae6a669c71d2
Ajay Nadathur [Wed, 2 Aug 2017 21:46:26 +0000 (14:46 -0700)]
Add 'clear' button to pin/password lock screen
bug:
62904466
Test: Manually tested, added functional tests
Change-Id: I5f5555d99b47550a8fef6995222d12155b4072a9
Fan Zhang [Thu, 3 Aug 2017 00:32:43 +0000 (17:32 -0700)]
Move a11y indexing from DynamicContentMonitor to loader
This is necessary to kill DynamicContentMonitor later
- Removed all logic related to indexing accesiblitysetting from the
monitor class and AccessibilitySetting page itself
- Created a loader to search against A11yServices at runtime
I noticed adding a loader in SearchResultsAdapter is rather manual. It's
something we should consider refactor in the future.
Bug:
64310452
Test: robotests
Change-Id: Iff31aff65ce000991229433f294e2ec69af99da2
Doris Ling [Thu, 3 Aug 2017 17:08:29 +0000 (17:08 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev
am:
713e4f65bd
Change-Id: I1513ccfbd7fb3679bda8d8570e34ad9ac2f0441e
Lei Yu [Thu, 3 Aug 2017 17:08:05 +0000 (17:08 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
am:
2750dd8d6d
Change-Id: I39fc570ff7af36a55d46aa2d626a94fbba2c1190
Doris Ling [Thu, 3 Aug 2017 17:01:50 +0000 (17:01 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev
Lei Yu [Thu, 3 Aug 2017 16:55:03 +0000 (16:55 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
Ajay Nadathur [Thu, 3 Aug 2017 16:45:10 +0000 (16:45 +0000)]
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
Kenny Guy [Tue, 20 Jun 2017 15:43:19 +0000 (16:43 +0100)]
Update work briefcase asset.
Bug:
36497538
Test: manual
Change-Id: If8c7385f75c1ff5b9fc257991e1c3255a70c8f8b
(cherry picked from commit
bb504346c779eee7fc3cf6650472a16dacc66b34)
Amit Mahajan [Thu, 3 Aug 2017 01:57:38 +0000 (01:57 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
am:
d1c3bb1341
Change-Id: If5018f14c636f6634e70771471ee6ee2103a0ede
TreeHugger Robot [Thu, 3 Aug 2017 01:46:21 +0000 (01:46 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
pkanwar [Tue, 18 Jul 2017 20:39:53 +0000 (13:39 -0700)]
Add support for carrier wifi in UI.
Make changes to the UI, so that it does not ask for additional
information while connecting to Carrier Wifi. Also, indicate in wifi
picker if the wifi is a carrier network.
Bug:
30988281
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Test: manual
Change-Id: Iecbcd77d400264aaaa16a6a95a2093d58f2748f9
Doris Ling [Wed, 2 Aug 2017 22:21:50 +0000 (15:21 -0700)]
Make account preference icons bigger.
Use the regular preference layout for AccountTypePreference so that the
icon size will be the standard size.
Change-Id: I58a9e2d02b94f5abd9c8bb546f3d4e2984b3d6c6
Fix:
63660734
Test: visual
Bill Yi [Wed, 2 Aug 2017 22:07:22 +0000 (22:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
a3bdce963f -s ours
Change-Id: I832d9850508a376fc4dccc53df3a943379ada6cf
TreeHugger Robot [Wed, 2 Aug 2017 21:57:36 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Fan Zhang [Wed, 2 Aug 2017 20:59:50 +0000 (20:59 +0000)]
Style action bar during onResume instead of onCreate
am:
e156d9a59f -s ours
Change-Id: I4b6c8332a9a950fc9b5ca2310a4099e7cf887202
Ajay Nadathur [Thu, 20 Jul 2017 02:09:33 +0000 (19:09 -0700)]
Fingerprint added graphic is bigger than enrolling progressbar
bug:
63714762
Test: Manually tested
Change-Id: I415ab41bb985eb52146693091d61152b51ecfd6c
Bill Yi [Wed, 2 Aug 2017 19:47:11 +0000 (12:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie91a9117688052ec898ebf955a9c6978e1304af6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Fan Zhang [Wed, 2 Aug 2017 17:47:37 +0000 (10:47 -0700)]
Style action bar during onResume instead of onCreate
Change-Id: I628266e7062e514d2044c9e32668db23094d82e6
Merged-In: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix:
64284689
Bug:
64297479
Test: robotests
jackqdyulei [Tue, 1 Aug 2017 17:45:41 +0000 (10:45 -0700)]
Turn on bluetooth anomaly detector
Since the related bug in battery stats is fixed, it is safe to
turn it on.
Also fix a bug in LocationCheckAction. In PermissionChecker we should
use permission name to check, not permission group name.
Bug:
64255601
Test: RunSettingsRoboTests
Change-Id: Ief8b5dc98f8a7ae462eb84936f6f61d626d7cddd
Fan Zhang [Wed, 2 Aug 2017 17:47:37 +0000 (10:47 -0700)]
Style action bar during onResume instead of onCreate
Change-Id: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix:
64284689
Bug:
64297479
Test: robotests
Amit Mahajan [Wed, 2 Aug 2017 16:59:03 +0000 (09:59 -0700)]
Change to not cache user entered apn type as user may change it.
Test: manual
Bug:
64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
Bill Yi [Wed, 2 Aug 2017 14:57:50 +0000 (14:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Andrew Sapperstein [Wed, 2 Aug 2017 06:07:23 +0000 (06:07 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am:
3daceaec5f
Change-Id: Iabce075585a4cca4c0876999f6b9e9f031fe2c10
TreeHugger Robot [Wed, 2 Aug 2017 06:02:29 +0000 (06:02 +0000)]
Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
Bill Yi [Wed, 2 Aug 2017 01:01:46 +0000 (18:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee79f4aad0c81901bc3c79b8dac1c95c29db3f00
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Daniel Nishi [Tue, 1 Aug 2017 23:18:58 +0000 (23:18 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am:
b27d65fa55
Change-Id: Id09171357fb772cc05ec668eafa10e5320cefeb5
Daniel Nishi [Tue, 1 Aug 2017 23:11:18 +0000 (23:11 +0000)]
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
Malcolm Chen [Tue, 1 Aug 2017 22:51:05 +0000 (15:51 -0700)]
In the “Data usage” subtext, remove the word “between”.
Bug:
64072976
Test: manual
Change-Id: I8720f0cf84270d2e8b50547188e48478b889ec81
TreeHugger Robot [Tue, 1 Aug 2017 21:00:25 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Andrew Sapperstein [Sat, 29 Jul 2017 00:51:17 +0000 (17:51 -0700)]
Refactoring DoubleTwistPreferenceController.
Made the availability and setting logic static so that
it can be invoked without creating a controller.
Bug:
62022517
Test: robotests
Change-Id: I3a51c61849e6ba8b8aa850ca22d666a9f84d252f
Meng Wang [Tue, 1 Aug 2017 20:37:37 +0000 (20:37 +0000)]
Merge "Rephrase emergency_address_summary to remove '911'" into oc-mr1-dev
Bill Yi [Tue, 1 Aug 2017 20:35:41 +0000 (20:35 +0000)]
Import translations. DO NOT MERGE
am:
b9fa3d1115 -s ours
Change-Id: I5efc1ca9ac51a4840d12fe21ba4db578dd00927e
TreeHugger Robot [Tue, 1 Aug 2017 19:45:59 +0000 (19:45 +0000)]
Merge "Shorten main settings battery string" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 19:09:31 +0000 (19:09 +0000)]
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
Bill Yi [Tue, 1 Aug 2017 18:31:16 +0000 (11:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2583b083c748943ce33715d13cf2f1c5cb9591dc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 1 Aug 2017 18:15:13 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64073208
Change-Id: Idb323f93239f5c66ae4fb53f37bff242d5839198
Bill Yi [Tue, 1 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Import translations. DO NOT MERGE
am:
2f525fbdc5 -s ours
Change-Id: Ie4d8ae83b68daefb3f38ee59fa961f8c127e3227
Bill Yi [Tue, 1 Aug 2017 18:03:31 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64073208
Change-Id: I9ff6c2aa7d4a499617610046f74bb60b9f58a399
Salvador Martinez [Mon, 31 Jul 2017 19:57:48 +0000 (12:57 -0700)]
Shorten main settings battery string
This string will be too long in other languages so we're shortening
it for the main settings screen.
Test: robotests updated
Bug:
64124535
Change-Id: I5ccad99b1023f84ee72a144e07b1ea60f3fc01d5
Meng Wang [Tue, 1 Aug 2017 16:34:54 +0000 (09:34 -0700)]
Rephrase emergency_address_summary to remove '911'
Because it's not easy to translate 911 per country.
Fixes:
64226955
Test: manual
Change-Id: Ibe052090f8d33a1f3f49150fb9c0c1cc2ffb947f
Geoffrey Pitsch [Tue, 1 Aug 2017 14:08:10 +0000 (14:08 +0000)]
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am:
6d62355313
Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
Geoffrey Pitsch [Tue, 1 Aug 2017 14:00:18 +0000 (14:00 +0000)]
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
jackqdyulei [Tue, 1 Aug 2017 02:44:09 +0000 (02:44 +0000)]
Merge "Add shadow and wrapper classes" into oc-dr1-dev
am:
0782535daf -s ours
Change-Id: Ic4e422d73f822b6f0a11ad624bd67e79ac1b9d73
TreeHugger Robot [Tue, 1 Aug 2017 02:37:37 +0000 (02:37 +0000)]
Merge "Add shadow and wrapper classes" into oc-dr1-dev
Jeff Davidson [Tue, 1 Aug 2017 02:32:04 +0000 (02:32 +0000)]
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
am:
cd4fbd90e7
Change-Id: Id37f4182ed523bbf263d6eb6c1517bbbfabf0ca4
TreeHugger Robot [Tue, 1 Aug 2017 02:25:02 +0000 (02:25 +0000)]
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 01:14:35 +0000 (01:14 +0000)]
Merge "Update icons to match quick setting" into oc-mr1-dev
Matthew Fritze [Tue, 1 Aug 2017 00:59:44 +0000 (00:59 +0000)]
Merge "Revert "resolve merge conflicts of
9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
Matthew Fritze [Tue, 1 Aug 2017 00:51:34 +0000 (00:51 +0000)]
Revert "resolve merge conflicts of
9feab7a8a5 to oc-mr1-dev"
This reverts commit
a504291eefc8b5d4d8fa5dd4416aa6e5118f3f60.
Reason for revert: <Build breaking>
Change-Id: I5da4f902d2fbcaffa44761b3f6ed8820ddb927bf
Matthew Fritze [Tue, 1 Aug 2017 00:45:29 +0000 (00:45 +0000)]
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
am:
57992394bf -s ours
Change-Id: I0e4e476dc7fb83b962ba2511ccc68a0c54d54a33