Commit Graph

18713 Commits

Author SHA1 Message Date
Meng Wang
04fc20fa19 Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev
am: 96ec0a9ade

Change-Id: I642e03b16372b632aee4bec387a7c47630b88ad0
2017-08-04 02:39:18 +00:00
TreeHugger Robot
96ec0a9ade Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev 2017-08-04 02:31:41 +00:00
Meng Wang
a04449b88a 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
2017-08-03 22:47:53 +00:00
Ajay Nadathur
48da03e6cd Add 'clear' button to pin/password lock screen
am: be2246bee7

Change-Id: I21c6c68199c281fbdb3ac97fd50f06bd612173dc
2017-08-03 20:40:06 +00:00
Ajay Nadathur
be2246bee7 Add 'clear' button to pin/password lock screen
bug: 62904466
Test: Manually tested, added functional tests
Change-Id: I5f5555d99b47550a8fef6995222d12155b4072a9
2017-08-03 17:46:51 +00:00
Doris Ling
159d832eb4 Merge "Make account preference icons bigger." into oc-dr1-dev am: 713e4f65bd
am: 38264f2144

Change-Id: I19b213d24af184075fe472e297914c247b48280d
2017-08-03 17:14:04 +00:00
Lei Yu
aefe48590c Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d
am: fab00d4262

Change-Id: I245198bcb78aca17c33fb24f17778af283d1c9b7
2017-08-03 17:13:36 +00:00
Doris Ling
ce056636ef Merge "Make account preference icons bigger." into oc-dr1-dev
am: 713e4f65bd

Change-Id: I1513ccfbd7fb3679bda8d8570e34ad9ac2f0441e
2017-08-03 17:08:29 +00:00
Doris Ling
38264f2144 Merge "Make account preference icons bigger." into oc-dr1-dev
am: 713e4f65bd

Change-Id: Ifc4750a60c72667e4611ab7c6fb0bb08b95b967f
2017-08-03 17:08:29 +00:00
Lei Yu
fab00d4262 Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
am: 2750dd8d6d

Change-Id: Ifdaaab5254e497839beb4c1eb749b310b5b512ae
2017-08-03 17:08:05 +00:00
Lei Yu
95fc90a45c Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
am: 2750dd8d6d

Change-Id: I39fc570ff7af36a55d46aa2d626a94fbba2c1190
2017-08-03 17:08:05 +00:00
Doris Ling
713e4f65bd Merge "Make account preference icons bigger." into oc-dr1-dev 2017-08-03 17:01:50 +00:00
Lei Yu
2750dd8d6d Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev 2017-08-03 16:55:03 +00:00
Amit Mahajan
fdb5c991c1 Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am: d1c3bb1341
am: 0af5de0639

Change-Id: I70d05c9f4ae755dd9958aac60a9ca6ac8592ca07
2017-08-03 02:02:37 +00:00
Amit Mahajan
0af5de0639 Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
am: d1c3bb1341

Change-Id: I693e64b11f9f4320d57749e35143d201fa3d23ca
2017-08-03 01:57:38 +00:00
Amit Mahajan
3d8d9808dd Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev
am: d1c3bb1341

Change-Id: If5018f14c636f6634e70771471ee6ee2103a0ede
2017-08-03 01:57:38 +00:00
TreeHugger Robot
d1c3bb1341 Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev 2017-08-03 01:46:21 +00:00
Doris Ling
d1e8e5394c 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
2017-08-02 15:21:50 -07:00
Fan Zhang
a31da35b74 Style action bar during onResume instead of onCreate
am: 50eb81f114

Change-Id: I4259ccfcb36b193a2fa4c745338860c407eeedd6
2017-08-02 21:01:16 +00:00
Fan Zhang
97e850ade9 Style action bar during onResume instead of onCreate
am: e156d9a59f

Change-Id: Iee729bda63cb9cf007754d1003fa02d755d5a771
2017-08-02 20:50:24 +00:00
Fan Zhang
e156d9a59f Style action bar during onResume instead of onCreate
Change-Id: I628266e7062e514d2044c9e32668db23094d82e6
Merged-In: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix: 64284689
Bug: 64297479
Test: robotests
2017-08-02 11:34:35 -07:00
jackqdyulei
dff144ad62 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
2017-08-02 11:24:16 -07:00
Fan Zhang
50eb81f114 Style action bar during onResume instead of onCreate
Change-Id: Ib57bf128b644737b5a34238ec85ca6d740543c5f
Fix: 64284689
Bug: 64297479
Test: robotests
2017-08-02 17:58:47 +00:00
Amit Mahajan
9eac2f7cbc Change to not cache user entered apn type as user may change it.
Test: manual
Bug: 64263412
Change-Id: Idc49109926e123eddec7f6553f3c493b1ed22212
2017-08-02 09:59:03 -07:00
Andrew Sapperstein
d126c63e22 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev am: 3daceaec5f
am: aa661b548b

Change-Id: Ieb0569d46a5f06aa6fd372b685d8f64152d68029
2017-08-02 06:11:53 +00:00
Andrew Sapperstein
aa661b548b Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am: 3daceaec5f

Change-Id: Ie4d946fb7ca1c018f8e1e5f3b54462f0e59041fa
2017-08-02 06:07:23 +00:00
Andrew Sapperstein
0f13525842 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am: 3daceaec5f

Change-Id: Iabce075585a4cca4c0876999f6b9e9f031fe2c10
2017-08-02 06:07:23 +00:00
TreeHugger Robot
3daceaec5f Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev 2017-08-02 06:02:29 +00:00
Daniel Nishi
85cd1b7d39 Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55
am: db1158f855

Change-Id: I39a83eff9705f8ed5e66a4ea4aeada9f262d12aa
2017-08-01 23:27:41 +00:00
Daniel Nishi
ea39f74a42 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Id09171357fb772cc05ec668eafa10e5320cefeb5
2017-08-01 23:18:58 +00:00
Daniel Nishi
db1158f855 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Ie3f854c21d7a099095202a9005cea6a8aec670c2
2017-08-01 23:18:57 +00:00
Daniel Nishi
b27d65fa55 Merge "Make nfc toggability logic static and public." into oc-dr1-dev 2017-08-01 23:11:18 +00:00
Andrew Sapperstein
9c9549bd29 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
2017-08-01 13:56:51 -07:00
Salvador Martinez
6db99201aa Merge "Shorten main settings battery string" into oc-mr1-dev
am: 4e963f8f91

Change-Id: I00e0b8126679815d460336d1cc2b01fc5abf55bd
2017-08-01 20:01:13 +00:00
TreeHugger Robot
4e963f8f91 Merge "Shorten main settings battery string" into oc-mr1-dev 2017-08-01 19:45:59 +00:00
Fan Zhang
bbd92b5748 Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
am: 7fbfda67da

Change-Id: Idac94b7754631c7bb0c0f91e8aa17b9d300b6c30
2017-08-01 19:24:23 +00:00
TreeHugger Robot
7fbfda67da Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev 2017-08-01 19:09:31 +00:00
Salvador Martinez
dcb96058ef 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
2017-08-01 10:29:44 -07:00
Geoffrey Pitsch
5e6449b4f8 Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
am: 07052239fd

Change-Id: Id42693f5c0ba902f57c5c30a69ca19dba1d9e340
2017-08-01 14:16:59 +00:00
Geoffrey Pitsch
cf83f9dd12 Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am: 6d62355313

Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
2017-08-01 14:08:10 +00:00
Geoffrey Pitsch
07052239fd Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am: 6d62355313

Change-Id: Iad2c8b60c899314b5089d28b3697f7bfed9013b3
2017-08-01 14:07:37 +00:00
Geoffrey Pitsch
6d62355313 Merge "AOD setting availability depends on other user settings" into oc-dr1-dev 2017-08-01 14:00:18 +00:00
jackqdyulei
26e7518f76 Merge "Add shadow and wrapper classes" into oc-dr1-dev
am: 0782535daf

Change-Id: I9f9337b3abc97652a1105c001fbe41d15b3e262d
2017-08-01 02:44:11 +00:00
TreeHugger Robot
0782535daf Merge "Add shadow and wrapper classes" into oc-dr1-dev 2017-08-01 02:37:37 +00:00
Jeff Davidson
6f95de16b5 Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7
am: cebb6a4f9c

Change-Id: I083d1356461b78dec175a770643a1d52949f93e4
2017-08-01 02:35:01 +00:00
Jeff Davidson
cebb6a4f9c Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
am: cd4fbd90e7

Change-Id: I65f2baef41c86ebcc4d6f427fa806441123621f0
2017-08-01 02:32:04 +00:00
Jeff Davidson
470c87cfea Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
am: cd4fbd90e7

Change-Id: Id37f4182ed523bbf263d6eb6c1517bbbfabf0ca4
2017-08-01 02:32:04 +00:00
TreeHugger Robot
cd4fbd90e7 Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev 2017-08-01 02:25:02 +00:00
Matthew Fritze
8c0d24cb6d Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
am: 21b22f0154

Change-Id: I9f203d14386598c0cb9c3264350564d75280e9a7
2017-08-01 01:01:35 +00:00
Matthew Fritze
21b22f0154 Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev 2017-08-01 00:59:44 +00:00