Fan Zhang
1f6f8e1010
Merge "Misc tweaks in settings" into oc-mr1-dev
...
am: 2c9e62ab0e
2017-08-04 20:27:34 +00:00
TreeHugger Robot
2c9e62ab0e
Merge "Misc tweaks in settings" into oc-mr1-dev
2017-08-04 20:16:36 +00:00
Doris Ling
49af0bd8ae
Merge "Fix crash when dismissing suggestions." into oc-mr1-dev
...
am: e923d649c0
2017-08-04 20:14:27 +00:00
Doris Ling
e923d649c0
Merge "Fix crash when dismissing suggestions." into oc-mr1-dev
2017-08-04 20:09:07 +00:00
Fan Zhang
8722509eb9
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
2017-08-04 10:42:27 -07:00
Tadashi G. Takaoka
16fdc516ac
Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev
...
am: 48f8ab9bc9
2017-08-04 04:19:24 +00:00
Tadashi G. Takaoka
48f8ab9bc9
Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev
2017-08-04 04:11:42 +00:00
Malcolm Chen
1e63581edb
Merge "In the Data usage subtext, remove the word between." into oc-mr1-dev
...
am: e84e1f1b03
2017-08-04 03:13:50 +00:00
TreeHugger Robot
e84e1f1b03
Merge "In the “Data usage” subtext, remove the word “between”." into oc-mr1-dev
2017-08-04 03:05:21 +00:00
Meng Wang
04fc20fa19
Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev
...
am: 96ec0a9ade
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
Doris Ling
9f90680456
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
2017-08-03 15:12:36 -07:00
Ajay Nadathur
48da03e6cd
Add 'clear' button to pin/password lock screen
...
am: be2246bee7
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
Android Build Merger (Role)
10f87032af
Merge "Merge "Make account preference icons bigger." into oc-dr1-dev am: 713e4f65bd am: ce056636ef" into oc-mr1-dev-plus-aosp
2017-08-03 17:14:27 +00:00
Android Build Merger (Role)
d7ded8752a
Merge "Merge "Make account preference icons bigger." into oc-dr1-dev am: 713e4f65bd am: 38264f2144" into oc-mr1-dev-plus-aosp
2017-08-03 17:14:21 +00:00
Doris Ling
f78eb681f1
Merge "Make account preference icons bigger." into oc-dr1-dev am: 713e4f65bd
...
am: ce056636ef
2017-08-03 17:14:10 +00:00
Android Build Merger (Role)
2726d7b2cd
Merge "Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d am: 95fc90a45c" into oc-mr1-dev-plus-aosp
2017-08-03 17:14:05 +00:00
Doris Ling
159d832eb4
Merge "Make account preference icons bigger." into oc-dr1-dev am: 713e4f65bd
...
am: 38264f2144
2017-08-03 17:14:04 +00:00
Lei Yu
c519698765
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d
...
am: 95fc90a45c
2017-08-03 17:13:36 +00:00
Lei Yu
aefe48590c
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d
...
am: fab00d4262
2017-08-03 17:13:36 +00:00
Doris Ling
ce056636ef
Merge "Make account preference icons bigger." into oc-dr1-dev
...
am: 713e4f65bd
2017-08-03 17:08:29 +00:00
Doris Ling
38264f2144
Merge "Make account preference icons bigger." into oc-dr1-dev
...
am: 713e4f65bd
2017-08-03 17:08:29 +00:00
Lei Yu
95fc90a45c
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
...
am: 2750dd8d6d
2017-08-03 17:08:05 +00:00
Lei Yu
fab00d4262
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev
...
am: 2750dd8d6d
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
Ajay Nadathur
1f2317c4b4
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
...
am: 1908c4010b
2017-08-03 16:51:06 +00:00
Ajay Nadathur
1908c4010b
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
2017-08-03 16:45:10 +00:00
Kenny Guy
413d71d400
Update work briefcase asset.
...
am: 27ea052133
2017-08-03 14:20:53 +00:00
Kenny Guy
27ea052133
Update work briefcase asset.
...
Bug: 36497538
Test: manual
Change-Id: If8c7385f75c1ff5b9fc257991e1c3255a70c8f8b
(cherry picked from commit bb504346c7
2017-08-03 09:48:28 +00:00
Amit Mahajan
896037a1dc
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am: d1c3bb1341
...
am: 3d8d9808dd
2017-08-03 02:03:18 +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
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
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
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
Bill Yi
97d8360fc5
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours
...
am: 52498c1da9
2017-08-02 22:16:53 +00:00
Bill Yi
52498c1da9
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: a3bdce963f
2017-08-02 22:12:38 +00:00
Bill Yi
290200b2a7
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: a3bdce963f -s ours
...
am: f366a8716a
2017-08-02 22:11:51 +00:00
Bill Yi
f366a8716a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: a3bdce963f
2017-08-02 22:07:22 +00:00
TreeHugger Robot
a3bdce963f
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-08-02 21:57:36 +00:00
Fan Zhang
50790d76fa
Style action bar during onResume instead of onCreate am: e156d9a59f
...
am: 97e850ade9
2017-08-02 21:10:23 +00:00
Fan Zhang
85a0a5771e
Style action bar during onResume instead of onCreate am: e156d9a59f -s ours
...
am: cb9f8a8ebc
2017-08-02 21:01:43 +00:00
Fan Zhang
a31da35b74
Style action bar during onResume instead of onCreate
...
am: 50eb81f114
2017-08-02 21:01:16 +00:00
Fan Zhang
cb9f8a8ebc
Style action bar during onResume instead of onCreate
...
am: e156d9a59f
2017-08-02 20:59:50 +00:00
Fan Zhang
97e850ade9
Style action bar during onResume instead of onCreate
...
am: e156d9a59f
2017-08-02 20:50:24 +00:00
Ajay Nadathur
c13273687a
Fingerprint added graphic is bigger than enrolling progressbar
...
bug: 63714762
Test: Manually tested
Change-Id: I415ab41bb985eb52146693091d61152b51ecfd6c
2017-08-02 20:32:03 +00:00
Bill Yi
2533ebcc83
Import translations. DO NOT MERGE
...
Change-Id: Ie91a9117688052ec898ebf955a9c6978e1304af6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-02 12:47:11 -07:00
