Commit Graph

2853 Commits

Author SHA1 Message Date
Daniel Nishi
6df5c65f45 Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
am: 8bbc28a95b

Change-Id: I2f52d59322a5b5f3960aa686adca06451ca87d13
2017-08-09 22:51:45 +00:00
Daniel Nishi
8bbc28a95b Merge "Expose the notification-swipe controls." into oc-dr1-dev
am: c075f8943e

Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
2017-08-09 22:37:34 +00:00
Salvador Martinez
35c0949b2e Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
am: 7bc388d823

Change-Id: I33cb44239c0725efd34611c06ed1734a6898d943
2017-08-09 20:28:30 +00:00
Ajay Nadathur
b9c3eb954a Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am: 0ed0319005

Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
2017-08-09 20:27:45 +00:00
Salvador Martinez
7bc388d823 Merge "Update availability for mobile network" into oc-dr1-dev
am: 4bcc3eb193

Change-Id: I8dca27c407709961ed28c64b76304894d5456781
2017-08-09 20:21:32 +00:00
TreeHugger Robot
0ed0319005 Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev 2017-08-09 20:15:20 +00:00
Justin Klaassen
6652cfcd7e Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
am: d59854de24

Change-Id: I244bebfc463e3d045556a74a2de0cb9ef5f862af
2017-08-09 20:01:40 +00:00
TreeHugger Robot
d59854de24 Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev 2017-08-09 19:40:03 +00:00
Matthew Fritze
f9831dc7be Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
am: e0c0616d6f

Change-Id: I4c63b3c4fad2824d45cc6637d08074a7fb3059fd
2017-08-09 18:37:19 +00:00
TreeHugger Robot
e0c0616d6f Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev 2017-08-09 18:22:21 +00:00
Fan Zhang
25f9060ab7 Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
am: 293899d5ce

Change-Id: Ic1518ede3d6ae01f409c44582415233371ba48ab
2017-08-09 18:04:15 +00:00
Fan Zhang
e809b806f9 Merge "Misc fixes for settings" into oc-mr1-dev
am: 54d816fd90

Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc
2017-08-09 18:03:29 +00:00
TreeHugger Robot
293899d5ce Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev 2017-08-09 17:53:22 +00:00
TreeHugger Robot
54d816fd90 Merge "Misc fixes for settings" into oc-mr1-dev 2017-08-09 17:52:49 +00:00
Ajay Nadathur
bf3a135170 Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog

bug: 64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
2017-08-09 17:51:50 +00:00
Justin Klaassen
3025727e16 Ask device owner for master clear in demo mode
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 10:44:19 -07:00
Daniel Nishi
c075f8943e Merge "Expose the notification-swipe controls." into oc-dr1-dev 2017-08-09 16:16:49 +00:00
Matthew Fritze
c6211c8829 Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
2017-08-08 19:03:43 -07:00
Fan Zhang
816efc02fc Refresh preferences when background data switch is toggled
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes: 64466310
Test: robotests
2017-08-08 17:38:28 -07:00
Daniel Nishi
f89327aa88 Expose the notification-swipe controls.
Bug: 62022517
Test: Settings robotest
Change-Id: I41368a9e03f38052bb47d04f6b98d56808d07e48
2017-08-08 17:30:38 -07:00
Fan Zhang
b5989fc3b7 Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
am: fef5f6aa4a

Change-Id: I8c5ee9684f4a1fb8356aa35ab6ca26b80ada7436
2017-08-08 22:28:07 +00:00
TreeHugger Robot
fef5f6aa4a Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev 2017-08-08 22:13:13 +00:00
Salvador Martinez
fe7c35803e Update availability for mobile network
This CL updates the availability to behave properly when a
user other than the primary user is accessing it. This also
makes the api return no intent if they don't have permission to
access this because attempting to go to that screen will cause a
crash. Also updates tests related to this change.

Test: robotests still pass
Bug: 64092292
Change-Id: If9913d9ae08ee3e205ff324aaeeadc755ff1d23d
2017-08-08 15:04:04 -07:00
Daniel Nishi
5abc894236 Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
am: a28dc40543

Change-Id: I55ba747a08ac5ab6c043a7b53961b1728e4c1a6d
2017-08-08 21:03:32 +00:00
Daniel Nishi
a28dc40543 Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev 2017-08-08 20:46:50 +00:00
jackqdyulei
51aac2af9e Merge "Add uid data even though on battery stats" into oc-mr1-dev
am: 189899c169

Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020
2017-08-08 19:28:39 +00:00
TreeHugger Robot
189899c169 Merge "Add uid data even though on battery stats" into oc-mr1-dev 2017-08-08 19:22:50 +00:00
Daniel Nishi
fb83e50d99 Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I0791bdddf0bc97abc21cd27613998247b11d7bb4
2017-08-08 11:21:01 -07:00
Fan Zhang
6d479d99a9 Misc fixes for settings
- Set device credential's Window flag to be SECURE. This prevents
  showing any pattern/pin in recent list.
- Disable tap sound on entity header

Fixes: 64339515
Fixes: 64413598
Test: visual
Test: runtest --path \
      tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
2017-08-08 10:34:03 -07:00
Salvador Martinez
0d337881ad Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
am: b32159f242

Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
2017-08-08 03:07:08 +00:00
Salvador Martinez
b1c0e38284 Refactor permissions code for bluetooth controller enabler
am: a8db5ccea8

Change-Id: I6288cf595419229f58abb396cbe9b6cf6e2c5fc4
2017-08-08 03:04:45 +00:00
Salvador Martinez
b32159f242 Refactor permissions code for bluetooth controller enabler
am: a8db5ccea8

Change-Id: Iba30360a0ec1c074a62562d4a9937eb9e37a4881
2017-08-08 03:04:45 +00:00
Salvador Martinez
a8db5ccea8 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
2017-08-07 17:51:02 -07:00
jackqdyulei
fe5a771e92 Add uid data even though on battery stats
Advacned battery page doesn't show background toggle because it
doesn't get uid from battery stats. This cl make it get uid by
package name even though without battery stats.

Bug: 64049162
Test: RunSettingsRoboTests
Change-Id: Ie0f67ce9d080c02763a8382740e0640a66ce6053
2017-08-07 14:38:21 -07: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
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
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
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
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
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