Commit Graph

39481 Commits

Author SHA1 Message Date
Bill Yi
cf297dcca3 Import translations. DO NOT MERGE am: c89d5b0093 -s ours
am: 335a436998  -s ours

Change-Id: I29958981b713fcee867dc6457cab116518bbe0e9
2017-08-07 06:02:28 +00:00
Bill Yi
335a436998 Import translations. DO NOT MERGE
am: c89d5b0093  -s ours

Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a
2017-08-07 05:50:24 +00:00
Matthew Fritze
6593453d59 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
2017-08-06 14:29:16 -07:00
Matthew Fritze
a9dfbcee2b Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
am: 688e5438dd

Change-Id: Ib60cae1c0cf7e0c55b90792d16df3803e84a7835
2017-08-06 20:52:37 +00:00
TreeHugger Robot
688e5438dd Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev 2017-08-06 20:46:27 +00:00
Bill Yi
c89d5b0093 Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 10:38:44 -07:00
Bill Yi
e9376927a0 Import translations. DO NOT MERGE
am: 57c8508960  -s ours

Change-Id: I813ef1adb4ab7dac7fa61572aa9835f6fbc8187d
2017-08-06 04:55:27 +00:00
Bill Yi
57c8508960 Import translations. DO NOT MERGE
Change-Id: I2383afbd653fa9e3a1ed0e469bdbd891868f992e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 19:27:58 -07:00
Android Build Merger (Role)
ab8ee77a54 Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff am: 1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp 2017-08-05 05:40:07 +00:00
Doris Ling
b358605a3e Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours
am: e46ed6b7c5  -s ours

Change-Id: Ica7b012178b2cc1d2a7115685b5054bc1e8b5d21
2017-08-05 05:39:42 +00:00
Doris Ling
fe9be5cfc7 Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff
am: 1f39ca8abf  -s ours

Change-Id: I73d69b3477582bfc5ea77a996b41e5b7c7a8d9cd
2017-08-05 05:39:41 +00:00
Doris Ling
1f39ca8abf Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am: 8f54cd46ff

Change-Id: Ib2b362ce72312738201fa2003c2c5a8795c2366d
2017-08-05 05:32:43 +00:00
Doris Ling
e46ed6b7c5 Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am: 8f54cd46ff  -s ours

Change-Id: I42d026677b6ca61de451a590b938605e79c1832c
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
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  -s ours

Change-Id: Ieb0315b765927b4c668862108fea2cea6f0aed69
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  -s ours

Change-Id: If805e7deb61b8fce522bb591771ad3322bcf52a2
2017-08-05 03:03:20 +00:00
Bill Yi
a064cc02fc Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 26e4fda3f2  -s ours

Change-Id: I8bc54083c553844ec2c8a65858f4b305fa30cf82
2017-08-05 02:49:27 +00:00
Bill Yi
cf898e3ff4 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 26e4fda3f2  -s ours

Change-Id: I3a6622203e20263858b4d0e1d7fcd9233ad2c886
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
257814a658 RadioInfo: fix OMADM buttons am: d4e0fe7f93
am: 66a4bff1c8

Change-Id: I3fa101023d013ce8619c6f92639df7c35d9b2ba0
2017-08-05 00:16:45 +00:00
Meng Wang
eee2dac885 RadioInfo: fix OMADM buttons am: d4e0fe7f93
am: 8c2cd0d047

Change-Id: I81b3f80fa14e8f7fe74c0cc88821c4a75f85c3b8
2017-08-05 00:15:23 +00:00
Meng Wang
66a4bff1c8 RadioInfo: fix OMADM buttons
am: d4e0fe7f93

Change-Id: I401b5c686d184124cf97edfa332dacb301454e27
2017-08-05 00:04:44 +00:00
Meng Wang
8c2cd0d047 RadioInfo: fix OMADM buttons
am: d4e0fe7f93

Change-Id: Ie7b00572102938fe64c2c6d2a6ce964c02bc493b
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
a0bc09c27d Merge "Add support for carrier wifi in UI." into oc-mr1-dev
am: f8f6910d7c

Change-Id: I9dd4c176660a9ddc3bae28a9345828a78b59aa95
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

Change-Id: I2ffd5f2bd7fd2c58c8417a6971e53f4b2207b235
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
93a03de38a Merge "Move a11y indexing from DynamicContentMonitor to loader" into oc-mr1-dev
am: 0bfe384b93

Change-Id: I2c9065721524a58d88dc7cf64562ad36328cb35e
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
1f6f8e1010 Merge "Misc tweaks in settings" into oc-mr1-dev
am: 2c9e62ab0e

Change-Id: I67f8000451a584f96beb286c57d731d2241e9899
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

Change-Id: Id3f46f1a8a3751f82368c5effdba92db25b77199
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
Matthew Fritze
a35320ce3b Add INTENT_ONLY as a ResultPayload Availibility
Manual merge after a merge conflict.

Test: robotests
Bug: 64165583
Change-Id: I6eab018dc4065ceefdba2039a5842945e2f76a75
2017-08-04 11:49:24 -07:00
Fan Zhang
0cb4c86f4a 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
2017-08-04 11:16:17 -07: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
Matthew Fritze
eb1c480f49 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
2017-08-04 16:11:18 +00:00
Tadashi G. Takaoka
16fdc516ac Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev
am: 48f8ab9bc9

Change-Id: I953fa5673668123b76dfcd4690fe000d5db4885b
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

Change-Id: I110e04817b16c1b23f33e646e705c7fbdd9b9adb
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

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
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
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