Commit Graph

39593 Commits

Author SHA1 Message Date
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
ef2906237f Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev am: 96ec0a9ade
am: 04fc20fa19

Change-Id: Idf8529d367be2fd71b66c40ebd3dca8a0440d963
2017-08-04 02:44:49 +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
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
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
Tony Mantler
d3760bca2d Clean up unused variables/constants in DevelopmentSettings
Bug: clean-up
Test: Existing tests pass
Change-Id: I988b1206be740b04db858ab02bf8a131ea4dce51
2017-08-03 15:24:47 -07: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
07bb00714a Add 'clear' button to pin/password lock screen am: be2246bee7
am: 48da03e6cd

Change-Id: Ic70f8452eed63e3fc9e7c8f255e15783e3e06448
2017-08-03 20:45:52 +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
Tony Mantler
d45c581975 Move LogPersist to SettingsLib
Bug: 62442606
Test: LogdSizePreferenceControllerTest, LogpersistPreferenceControllerTest
Change-Id: Iabc3a86c839109f8e2b04d3e9b7128c987473ab3
2017-08-03 11:13:50 -07: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
4f3ad40afb Merge "Merge "Make account preference icons bigger." into oc-dr1-dev am: 713e4f65bd am: ce056636ef" into oc-mr1-dev-plus-aosp
am: 10f87032af

Change-Id: Ife93681fb2a7c07fbff2deab569527ed39832f67
2017-08-03 17:25:14 +00:00
Doris Ling
5999392cfc Merge "Merge "Make account preference icons bigger." into oc-dr1-dev am: 713e4f65bd am: 38264f2144" into oc-mr1-dev-plus-aosp
am: d7ded8752a

Change-Id: I0516512a9579780f848caffb20e2bedeb3d84ba8
2017-08-03 17:24:50 +00:00
Lei Yu
d2bce9d176 Merge "Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d am: 95fc90a45c" into oc-mr1-dev-plus-aosp
am: 2726d7b2cd

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

Change-Id: I451c43920bbd844582e1dc4b15231ff28e238243
2017-08-03 17:24:07 +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

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

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
Lei Yu
c519698765 Merge "Turn on bluetooth anomaly detector" into oc-dr1-dev am: 2750dd8d6d
am: 95fc90a45c

Change-Id: Ic6636bf1bf7cfe4561eb38f7081e9dee8235352f
2017-08-03 17:13:36 +00:00
Fan Zhang
5035f8c559 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
2017-08-03 10:10:59 -07: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
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
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
Ajay Nadathur
4aa65a6ed5 Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev am: 1908c4010b
am: 1f2317c4b4

Change-Id: I1484d56c8215d55e8488074fa997a162b4b7ac15
2017-08-03 16:57:05 +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

Change-Id: I949aa81a0a88be0824590d85a50400b1b1268d3f
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
332272b596 Update work briefcase asset. am: 27ea052133
am: 413d71d400

Change-Id: Ie98fd7842491f213cce743a80caff8534331f0fb
2017-08-03 14:26:24 +00:00
Kenny Guy
413d71d400 Update work briefcase asset.
am: 27ea052133

Change-Id: I1ddee0d3c4da6b41b51a38aa1bad9ce3b1c14840
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
TreeHugger Robot
9510aa7649 Merge "[Companion] Make notification dialog non-cancelable" 2017-08-03 04:59:45 +00:00
Eugene Susla
d004a96c5b [Companion] Make notification dialog non-cancelable
Bug: 63405718
Test: Ensute that the notification access dialog is not dismissable with
either back button or touch outside
Change-Id: I613da247a2adc0571478f649a2191cd5840359f0
2017-08-02 20:06:50 -07:00
Amit Mahajan
0e46ba10dc Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev am: d1c3bb1341 am: 3d8d9808dd
am: 896037a1dc

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

Change-Id: I89c002a1edcfe054914e13c264d071ed766f5f61
2017-08-03 02:13:20 +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

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

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
TreeHugger Robot
187b2f9d0c Merge "Convert app storage page to use generic ActionButtonPref" 2017-08-02 23:29:13 +00:00
pkanwar
0ce5e17792 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
2017-08-02 15:29:39 -07:00