Doris Ling
780b81a28c
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours am: e46ed6b7c5 -s ours
...
am: b358605a3e
2017-08-05 05:46:12 +00:00
Doris Ling
b358605a3e
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours
...
am: e46ed6b7c5
2017-08-05 05:39:42 +00:00
Doris Ling
e46ed6b7c5
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
...
am: 8f54cd46ff
2017-08-05 05:32:42 +00:00
TreeHugger Robot
8f54cd46ff
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
2017-08-05 05:20:42 +00:00
Bill Yi
4f132c2739
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: a064cc02fc -s ours" into oc-mr1-dev-plus-aosp
...
am: 7984efb252
2017-08-05 03:19:25 +00:00
Bill Yi
987f17e658
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: cf898e3ff4 -s ours
...
am: de2c068f79
2017-08-05 03:19:02 +00:00
Android Build Merger (Role)
7984efb252
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours am: a064cc02fc -s ours" into oc-mr1-dev-plus-aosp
2017-08-05 03:03:54 +00:00
Bill Yi
ed632b96a2
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours
...
am: a064cc02fc
2017-08-05 03:03:35 +00:00
Bill Yi
de2c068f79
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 26e4fda3f2 -s ours
...
am: cf898e3ff4
2017-08-05 03:03:20 +00:00
Bill Yi
a064cc02fc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 26e4fda3f2
2017-08-05 02:49:27 +00:00
Bill Yi
cf898e3ff4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 26e4fda3f2
2017-08-05 02:49:07 +00:00
TreeHugger Robot
26e4fda3f2
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-08-05 02:37:34 +00:00
Meng Wang
758a33dd51
RadioInfo: fix OMADM buttons am: d4e0fe7f93 am: 66a4bff1c8
...
am: 257814a658
2017-08-05 00:28:43 +00:00
Meng Wang
3524827f84
RadioInfo: fix OMADM buttons am: d4e0fe7f93 am: 8c2cd0d047
...
am: eee2dac885
2017-08-05 00:28:18 +00:00
Meng Wang
257814a658
RadioInfo: fix OMADM buttons am: d4e0fe7f93
...
am: 66a4bff1c8
2017-08-05 00:16:45 +00:00
Meng Wang
eee2dac885
RadioInfo: fix OMADM buttons am: d4e0fe7f93
...
am: 8c2cd0d047
2017-08-05 00:15:23 +00:00
Meng Wang
66a4bff1c8
RadioInfo: fix OMADM buttons
...
am: d4e0fe7f93
2017-08-05 00:04:44 +00:00
Meng Wang
8c2cd0d047
RadioInfo: fix OMADM buttons
...
am: d4e0fe7f93
2017-08-05 00:04:43 +00:00
Bill Yi
8cdf71313d
Import translations. DO NOT MERGE
...
Change-Id: I7b239876604bd4f172b8b7af2e0d9307f6b2217d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-04 17:04:36 -07:00
Doris Ling
058d2d10e2
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
2017-08-04 23:44:23 +00:00
pkanwar
74ca5db903
Merge "Add support for carrier wifi in UI." into oc-mr1-dev am: f8f6910d7c
...
am: a0bc09c27d
2017-08-04 22:54:24 +00:00
Fan Zhang
bbe2ac7b2d
Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev am: 4c84a61581
...
am: 9d8924bce3
2017-08-04 22:53:49 +00:00
pkanwar
a0bc09c27d
Merge "Add support for carrier wifi in UI." into oc-mr1-dev
...
am: f8f6910d7c
2017-08-04 22:45:36 +00:00
Fan Zhang
9d8924bce3
Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev
...
am: 4c84a61581
2017-08-04 22:45:08 +00:00
TreeHugger Robot
f8f6910d7c
Merge "Add support for carrier wifi in UI." into oc-mr1-dev
2017-08-04 22:41:13 +00:00
TreeHugger Robot
4c84a61581
Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev
2017-08-04 22:36:57 +00:00
Fan Zhang
3e5a5828ad
Merge "Move a11y indexing from DynamicContentMonitor to loader" into oc-mr1-dev am: 0bfe384b93
...
am: 93a03de38a
2017-08-04 21:10:01 +00:00
Fan Zhang
93a03de38a
Merge "Move a11y indexing from DynamicContentMonitor to loader" into oc-mr1-dev
...
am: 0bfe384b93
2017-08-04 21:02:55 +00:00
TreeHugger Robot
0bfe384b93
Merge "Move a11y indexing from DynamicContentMonitor to loader" into oc-mr1-dev
2017-08-04 20:50:26 +00:00
Fan Zhang
68405546ca
Merge "Misc tweaks in settings" into oc-mr1-dev am: 2c9e62ab0e
...
am: 1f6f8e1010
2017-08-04 20:32:02 +00:00
Doris Ling
466c136ebc
Merge "Fix crash when dismissing suggestions." into oc-mr1-dev am: e923d649c0
...
am: 49af0bd8ae
2017-08-04 20:31:41 +00:00
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
TreeHugger Robot
e8dd6a2e6b
Merge "Clean up unused variables/constants in DevelopmentSettings"
2017-08-04 18:49:33 +00:00
TreeHugger Robot
6c753e8847
Merge "Clean up styles and delete unused layout for action buttons"
2017-08-04 17:58:37 +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
513d334ef3
Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev am: 48f8ab9bc9
...
am: 16fdc516ac
2017-08-04 04:25:54 +00: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
1acbee786b
Merge "In the Data usage subtext, remove the word between." into oc-mr1-dev am: e84e1f1b03
...
am: 1e63581edb
2017-08-04 03:19:51 +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
ef2906237f
Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev am: 96ec0a9ade
...
am: 04fc20fa19
2017-08-04 02:44:49 +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
d4e0fe7f93
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-04 00:47:09 +00:00
Fan Zhang
7686ef863c
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
2017-08-03 16:23:27 -07:00
Fan Zhang
797d2e126a
Clean up styles and delete unused layout for action buttons
...
Change-Id: I65725b4ea04087b582a08497fd838d14e834b47a
Fixes: 63991885
Test: robotest and visual
2017-08-03 16:16:18 -07:00
