OSDN Git Service
Android Build Merger (Role) [Tue, 8 Aug 2017 03:07:45 +0000 (03:07 +0000)]
Merge "Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8 am:
b1c0e38284" into oc-mr1-dev-plus-aosp
Salvador Martinez [Tue, 8 Aug 2017 03:07:08 +0000 (03:07 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8
am:
b32159f242
Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
Salvador Martinez [Tue, 8 Aug 2017 03:07:08 +0000 (03:07 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8
am:
b1c0e38284
Change-Id: I1f58b6310db52eb0d3286a755e210dfe74c6fc96
Salvador Martinez [Tue, 8 Aug 2017 03:04:45 +0000 (03:04 +0000)]
Refactor permissions code for bluetooth controller enabler
am:
a8db5ccea8
Change-Id: Iba30360a0ec1c074a62562d4a9937eb9e37a4881
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
Philip P. Moltmann [Mon, 7 Aug 2017 23:06:28 +0000 (23:06 +0000)]
Merge "Revoke invidivual permissions" into oc-mr1-dev
am:
62b6b4d292
Change-Id: I56d7811dd62fdfbedf5d958496448479c352dd0e
TreeHugger Robot [Mon, 7 Aug 2017 22:58:33 +0000 (22:58 +0000)]
Merge "Revoke invidivual permissions" into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 20:26:23 +0000 (20:26 +0000)]
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
am:
8d3bfd62e1
Change-Id: If53c79b20d637623a6d70b1c3bfd7efa788f25f3
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
Beverly [Mon, 7 Aug 2017 17:21:53 +0000 (17:21 +0000)]
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
am:
7fc4dd7e7b
Change-Id: Ie989acfd2f7896a1160cac32f5e379112737028a
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
Android Build Merger (Role) [Mon, 7 Aug 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395 -s ours am:
f1398725a8 -s ours" into oc-mr1-dev-plus-aosp
Matthew Fritze [Mon, 7 Aug 2017 17:05:37 +0000 (17:05 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395 -s ours
am:
f1398725a8 -s ours
Change-Id: I6d3710f9e399901aa62d69ae9061a5f563d6dd61
Matthew Fritze [Mon, 7 Aug 2017 17:05:20 +0000 (17:05 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395
am:
d1b29a4350 -s ours
Change-Id: Idcc62948fc80573fc49fef10f457841bc5bbd0de
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
Matthew Fritze [Mon, 7 Aug 2017 17:02:19 +0000 (17:02 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
am:
4f0e5f8395
Change-Id: Ic0ec9ab01037fa67238b541f0e9e6bd1bde630fb
TreeHugger Robot [Mon, 7 Aug 2017 16:53:29 +0000 (16:53 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
Matthew Fritze [Mon, 7 Aug 2017 15:15:41 +0000 (15:15 +0000)]
Expose Location toggling logic
am:
6593453d59
Change-Id: Ic29118bac8ba7462e2f1dc889b4c6878e7a0e8ae
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
Bill Yi [Mon, 7 Aug 2017 06:22:10 +0000 (06:22 +0000)]
Import translations. DO NOT MERGE am:
c89d5b0093 -s ours am:
335a436998 -s ours
am:
cf297dcca3 -s ours
Change-Id: Id81f76f748bace0d87d03e2f5ff31dcc9f32750d
Bill Yi [Mon, 7 Aug 2017 06:02:28 +0000 (06:02 +0000)]
Import translations. DO NOT MERGE am:
c89d5b0093 -s ours
am:
335a436998 -s ours
Change-Id: I29958981b713fcee867dc6457cab116518bbe0e9
Bill Yi [Mon, 7 Aug 2017 05:50:24 +0000 (05:50 +0000)]
Import translations. DO NOT MERGE
am:
c89d5b0093 -s ours
Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a
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
Matthew Fritze [Sun, 6 Aug 2017 20:52:37 +0000 (20:52 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
am:
688e5438dd
Change-Id: Ib60cae1c0cf7e0c55b90792d16df3803e84a7835
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 17:38:44 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 04:55:27 +0000 (04:55 +0000)]
Import translations. DO NOT MERGE
am:
57c8508960 -s ours
Change-Id: I813ef1adb4ab7dac7fa61572aa9835f6fbc8187d
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
Android Build Merger (Role) [Sat, 5 Aug 2017 05:40:07 +0000 (05:40 +0000)]
Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am:
8f54cd46ff am:
1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp
Doris Ling [Sat, 5 Aug 2017 05:39:42 +0000 (05:39 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am:
8f54cd46ff -s ours
am:
e46ed6b7c5 -s ours
Change-Id: Ica7b012178b2cc1d2a7115685b5054bc1e8b5d21
Doris Ling [Sat, 5 Aug 2017 05:39:41 +0000 (05:39 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am:
8f54cd46ff
am:
1f39ca8abf -s ours
Change-Id: I73d69b3477582bfc5ea77a996b41e5b7c7a8d9cd
Doris Ling [Sat, 5 Aug 2017 05:32:43 +0000 (05:32 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am:
8f54cd46ff
Change-Id: Ib2b362ce72312738201fa2003c2c5a8795c2366d
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
Android Build Merger (Role) [Sat, 5 Aug 2017 03:03:54 +0000 (03:03 +0000)]
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
Bill Yi [Sat, 5 Aug 2017 03:03:35 +0000 (03:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
26e4fda3f2 -s ours
am:
a064cc02fc -s ours
Change-Id: Ieb0315b765927b4c668862108fea2cea6f0aed69
Bill Yi [Sat, 5 Aug 2017 03:03:20 +0000 (03:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
26e4fda3f2 -s ours
am:
cf898e3ff4 -s ours
Change-Id: If805e7deb61b8fce522bb591771ad3322bcf52a2
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
Bill Yi [Sat, 5 Aug 2017 02:49:07 +0000 (02:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
26e4fda3f2 -s ours
Change-Id: I3a6622203e20263858b4d0e1d7fcd9233ad2c886
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:16:45 +0000 (00:16 +0000)]
RadioInfo: fix OMADM buttons am:
d4e0fe7f93
am:
66a4bff1c8
Change-Id: I3fa101023d013ce8619c6f92639df7c35d9b2ba0
Meng Wang [Sat, 5 Aug 2017 00:15:23 +0000 (00:15 +0000)]
RadioInfo: fix OMADM buttons am:
d4e0fe7f93
am:
8c2cd0d047
Change-Id: I81b3f80fa14e8f7fe74c0cc88821c4a75f85c3b8
Meng Wang [Sat, 5 Aug 2017 00:04:44 +0000 (00:04 +0000)]
RadioInfo: fix OMADM buttons
am:
d4e0fe7f93
Change-Id: I401b5c686d184124cf97edfa332dacb301454e27
Meng Wang [Sat, 5 Aug 2017 00:04:43 +0000 (00:04 +0000)]
RadioInfo: fix OMADM buttons
am:
d4e0fe7f93
Change-Id: Ie7b00572102938fe64c2c6d2a6ce964c02bc493b
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
pkanwar [Fri, 4 Aug 2017 22:45:36 +0000 (22:45 +0000)]
Merge "Add support for carrier wifi in UI." into oc-mr1-dev
am:
f8f6910d7c
Change-Id: I9dd4c176660a9ddc3bae28a9345828a78b59aa95
Fan Zhang [Fri, 4 Aug 2017 22:45:08 +0000 (22:45 +0000)]
Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev
am:
4c84a61581
Change-Id: I2ffd5f2bd7fd2c58c8417a6971e53f4b2207b235
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
Fan Zhang [Fri, 4 Aug 2017 21:02:55 +0000 (21:02 +0000)]
Merge "Move a11y indexing from DynamicContentMonitor to loader" into oc-mr1-dev
am:
0bfe384b93
Change-Id: I2c9065721524a58d88dc7cf64562ad36328cb35e
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
Fan Zhang [Fri, 4 Aug 2017 20:27:34 +0000 (20:27 +0000)]
Merge "Misc tweaks in settings" into oc-mr1-dev
am:
2c9e62ab0e
Change-Id: I67f8000451a584f96beb286c57d731d2241e9899
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:14:27 +0000 (20:14 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-mr1-dev
am:
e923d649c0
Change-Id: Id3f46f1a8a3751f82368c5effdba92db25b77199
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 [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:19:24 +0000 (04:19 +0000)]
Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev
am:
48f8ab9bc9
Change-Id: I953fa5673668123b76dfcd4690fe000d5db4885b
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
Malcolm Chen [Fri, 4 Aug 2017 03:13:50 +0000 (03:13 +0000)]
Merge "In the Data usage subtext, remove the word between." into oc-mr1-dev
am:
e84e1f1b03
Change-Id: I110e04817b16c1b23f33e646e705c7fbdd9b9adb
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
Meng Wang [Fri, 4 Aug 2017 02:39:18 +0000 (02:39 +0000)]
Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev
am:
96ec0a9ade
Change-Id: I642e03b16372b632aee4bec387a7c47630b88ad0
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 [Thu, 3 Aug 2017 20:40:06 +0000 (20:40 +0000)]
Add 'clear' button to pin/password lock screen
am:
be2246bee7
Change-Id: I21c6c68199c281fbdb3ac97fd50f06bd612173dc
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
Android Build Merger (Role) [Thu, 3 Aug 2017 17:14:27 +0000 (17:14 +0000)]
Merge "Merge "Make account preference icons bigger." into oc-dr1-dev am:
713e4f65bd am:
ce056636ef" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 3 Aug 2017 17:14:21 +0000 (17:14 +0000)]
Merge "Merge "Make account preference icons bigger." into oc-dr1-dev am:
713e4f65bd am:
38264f2144" into oc-mr1-dev-plus-aosp
Doris Ling [Thu, 3 Aug 2017 17:14:10 +0000 (17:14 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev am:
713e4f65bd
am:
ce056636ef
Change-Id: I253823c293e551e642613145d4528000d6868929
Android Build Merger (Role) [Thu, 3 Aug 2017 17:14:05 +0000 (17:14 +0000)]
Merge "Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am:
2750dd8d6d am:
95fc90a45c" into oc-mr1-dev-plus-aosp
Doris Ling [Thu, 3 Aug 2017 17:14:04 +0000 (17:14 +0000)]
Merge "Make account preference icons bigger." into oc-dr1-dev am:
713e4f65bd
am:
38264f2144
Change-Id: I19b213d24af184075fe472e297914c247b48280d
Lei Yu [Thu, 3 Aug 2017 17:13:36 +0000 (17:13 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am:
2750dd8d6d
am:
95fc90a45c
Change-Id: Ic6636bf1bf7cfe4561eb38f7081e9dee8235352f
Lei Yu [Thu, 3 Aug 2017 17:13:36 +0000 (17:13 +0000)]
Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am:
2750dd8d6d
am:
fab00d4262
Change-Id: I245198bcb78aca17c33fb24f17778af283d1c9b7
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: Ifc4750a60c72667e4611ab7c6fb0bb08b95b967f
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
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: Ifdaaab5254e497839beb4c1eb749b310b5b512ae
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:51:06 +0000 (16:51 +0000)]
Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev
am:
1908c4010b
Change-Id: I949aa81a0a88be0824590d85a50400b1b1268d3f
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 [Thu, 3 Aug 2017 14:20:53 +0000 (14:20 +0000)]
Update work briefcase asset.
am:
27ea052133
Change-Id: I1ddee0d3c4da6b41b51a38aa1bad9ce3b1c14840
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 02:03:18 +0000 (02:03 +0000)]
Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am:
d1c3bb1341
am:
3d8d9808dd
Change-Id: I50dd513140c05aeee04552f009ea010b84f8dade
Amit Mahajan [Thu, 3 Aug 2017 02:02:37 +0000 (02:02 +0000)]
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
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: I693e64b11f9f4320d57749e35143d201fa3d23ca
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:16:53 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
a3bdce963f -s ours
am:
52498c1da9 -s ours
Change-Id: Ibbca1b09b50102ece59623530bfe131610449c8d
OSDN Git Service
