PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,202 Commits 1 Branch 0 Tags
f76dafea55e254a7104db7c2634bd1f05f20b77c
Commit Graph

36202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f76dafea55 Merge "Dynamic summary text for network/connected device screen." 2017-05-18 18:54:48 +00:00
Matthew Fritze
cc7687c27c Merge "Update no search results icon and move image to top of page" into oc-dev am: fc4db3bd80 
am: 145c364479

Change-Id: I910bb7eeffe938f708c5d3df8a62790f92b83de1
 2017-05-18 17:23:01 +00:00
Matthew Fritze
145c364479 Merge "Update no search results icon and move image to top of page" into oc-dev 
am: fc4db3bd80

Change-Id: I6f387cf748a9e916e4ffd3312016b0a82e126ee2
 2017-05-18 17:18:30 +00:00
Lei Yu
9a4be81e5c Merge changes I573e4fb9,I8e7baadc into oc-dev am: 67e38774ce 
am: d85bdebe0e

Change-Id: I865f41eae196aee32edd60169dacbc5dca772439
 2017-05-18 17:12:34 +00:00
TreeHugger Robot
fc4db3bd80 Merge "Update no search results icon and move image to top of page" into oc-dev 2017-05-18 17:11:29 +00:00
Lei Yu
d85bdebe0e Merge changes I573e4fb9,I8e7baadc into oc-dev 
am: 67e38774ce

Change-Id: Id3a830eb46004a3febdb9c4bf96a39b8c4afaedd
 2017-05-18 17:08:33 +00:00
Lei Yu
67e38774ce Merge changes I573e4fb9,I8e7baadc into oc-dev 
* changes:
  Drop the misc and not smear it.
  Smear screen power usage based on activity time.
 2017-05-18 17:00:27 +00:00
Fan Zhang
7c3a87ebd3 Dynamic summary text for network/connected device screen. 
Change-Id: I3254c63b7c241e2de9251b3c2d2a0106fb049ece
Fix: 36768218
Test: make RunSettingsRoboTests
 2017-05-18 09:52:43 -07:00
TreeHugger Robot
821c83e749 Merge "Default setup wizard to use PIN" 2017-05-18 08:43:24 +00:00
Philip Quinn
2d6fef5e1c Increase the resolution of the assist gesture sensitivity slider. 
Test: make RunSettingsRoboTests && manual
Change-Id: I47cdeba932afb4ab68b2283efa479a1e4725675c
 2017-05-17 22:34:10 -07:00
Fan Zhang
867c68e76c Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev am: 2b030aeb65 
am: 60d26cfffa

Change-Id: I878bafe5a626e2f6fe9d8f4cfbb89dfeb763c7a0
 2017-05-18 01:14:10 +00:00
jackqdyulei
7d7080ab64 Drop the misc and not smear it. 
Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
 2017-05-17 18:12:03 -07:00
Fan Zhang
60d26cfffa Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev 
am: 2b030aeb65

Change-Id: I4c13fb0ce652108fdabbaa8ca215a5799374c8f8
 2017-05-18 01:11:00 +00:00
Fan Zhang
63c5b41f01 Merge "Fix robolectric test failure" into oc-dev am: 2545bcaa74 
am: 3970916cf1

Change-Id: I7f63f5cee9a91c8f88711a0ada04a24a676692f1
 2017-05-18 01:09:16 +00:00
jackqdyulei
2b923ce44f Smear screen power usage based on activity time. 
Bug: 38328636
Test: RunSettingsRoboTests
Change-Id: I8e7baadcd88a8e9d674f5bc8d8e42e0f3953c98a
 2017-05-17 18:06:47 -07:00
Fan Zhang
2b030aeb65 Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev 2017-05-18 01:05:39 +00:00
Fan Zhang
3970916cf1 Merge "Fix robolectric test failure" into oc-dev 
am: 2545bcaa74

Change-Id: I632edffaced0b4ce7d391d525c4d9288e5ba97cc
 2017-05-18 01:01:12 +00:00
Fan Zhang
2545bcaa74 Merge "Fix robolectric test failure" into oc-dev 2017-05-18 00:41:18 +00:00
Fan Zhang
c754f59fb0 Fix bug where accounts are duplicated in user&account list. 
This happens when user has different accounts with same account name. For
example: user@domain.com for type1 and same email for type2, etc. When
we refresh the account list during onResume(), the same account name
incorrectly causes the logic to think they are the same account and
updates the account list by mistake.

- Introduced a util method to generate unique key from Account object.
And set it as preference key.
- when updating preference on screen, use key to find preference instead
of the preference instance itself.

Change-Id: I0aa692cb965b7037155a746389a919cd155843da
Fix: 34035653
Test: make RunSettingsRoboTests
 2017-05-17 23:50:30 +00:00
Youhan Wang
1bceb954ed Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev am: 350ba4a4c3 
am: c6b1845d0f

Change-Id: I3bee5b3a1e90a7f8766b875045a54a9945264226
 2017-05-17 23:46:20 +00:00
Youhan Wang
c6b1845d0f Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev 
am: 350ba4a4c3

Change-Id: Ia508085e2fe2dd2061d772b0caf976d039aaa213
 2017-05-17 23:42:49 +00:00
Youhan Wang
350ba4a4c3 Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev 2017-05-17 23:38:08 +00:00
Matthew Fritze
b4f2f81f27 Update no search results icon and move image to top of page 
Change-Id: Ib57bdc49095091ff6e432be922da676806ee3e2f
Fixes: 36597112
Test: search for "aaa" and observe image
 2017-05-17 16:24:27 -07:00
Steven Ng
9a0299cd52 Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp am: 3b76c25cee -s ours 
am: 268be8edde

Change-Id: Idd556e4ec777eb2ec4c52c6df28f16a64435ca9c
 2017-05-17 22:54:57 +00:00
Steven Ng
268be8edde Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp 
am: 3b76c25cee  -s ours

Change-Id: I6b9f260b8494ced24cd758207981d60c9a5ca97e
 2017-05-17 22:49:14 +00:00
Fan Zhang
28dcdb7c3b Fix robolectric test failure 
Default UserManager caches instance across entire test suite, so 
test becomes flakey depending on the order they are run. Using a 
a ShadowUserManager without the cache ensures each test class gets
a UserManager with clean state.

Change-Id: Ia54f6a3259859add5a1e5d0101829497fb985ab1
Fix: 38393235
Test: make RunSettingsRoboTests
 2017-05-17 22:46:27 +00:00
Steven Ng
3b76c25cee Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp 2017-05-17 22:43:11 +00:00
Steven Ng
3c03b45a16 DO NOT MERGE Fix build failure due to missing guava target 
Test: 1) build sailfish-userdebug successfully
      2) m SettingsTests -j32 built successfully

Bug: 33059280
Change-Id: If1c281888e4581b5eb3b8842892464aebd04b827
 2017-05-17 22:40:33 +00:00
Lei Yu
868ecae66d Merge "Add AnomalyDetectionPolicy" 2017-05-17 21:10:30 +00:00
Steven Ng
70dab70c30 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours am: 9eeb954d39 -s ours 
am: be7621e1d7  -s ours

Change-Id: I8232b0ee829d7c46dacd066a746fb8055a5e3818
 2017-05-17 21:07:45 +00:00
Steven Ng
c8df41ec8f Fix phishing attack in ChooseLockGeneric am: 56870f438c -s ours 
am: b0ad380d0c  -s ours

Change-Id: I466c5cd87ac090793e44f1270a2bb1f6e7a4d611
 2017-05-17 21:07:09 +00:00
Steven Ng
be7621e1d7 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours 
am: 9eeb954d39  -s ours

Change-Id: I10aad8dbfe4b42a887b2166608456595640e0feb
 2017-05-17 21:05:09 +00:00
Steven Ng
b0ad380d0c Fix phishing attack in ChooseLockGeneric 
am: 56870f438c  -s ours

Change-Id: I3f71fa7a65f732de8816b43f02df3cf414e8408b
 2017-05-17 21:04:40 +00:00
Steven Ng
9eeb954d39 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours 
am: 6496c3757b  -s ours

Change-Id: I1032e8ad372d0f5cff35e1a1f018ceecedf9bff2
 2017-05-17 21:01:46 +00:00
Antony Sargent
3033c1a2cf Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am: c439202da9 
am: 3afb6616c6

Change-Id: I37280e12b32047ddef316be763f69b5ff648b557
 2017-05-17 19:41:16 +00:00
Antony Sargent
3afb6616c6 Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev 
am: c439202da9

Change-Id: I2e0eed6c7332a9968b020c69dcc7f5507b355f6e
 2017-05-17 19:12:43 +00:00
Matthew Fritze
c838e959f7 Merge "Remove duplicates from sound settings" into oc-dev am: 3abeba07d3 
am: a939959838

Change-Id: I0260cf2a7dd9d54b700387d0d82f58a7c6a3263c
 2017-05-17 19:07:45 +00:00
Matthew Fritze
8cd0562bd6 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce 
am: af054e63e0

Change-Id: I35667061a61fd66e8ab8acafccffb53f00f15149
 2017-05-17 19:06:59 +00:00
TreeHugger Robot
c439202da9 Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev 2017-05-17 18:59:54 +00:00
Matthew Fritze
a939959838 Merge "Remove duplicates from sound settings" into oc-dev 
am: 3abeba07d3

Change-Id: Ief8e333082ef6d8064a51fc54b052e1476880a55
 2017-05-17 18:51:14 +00:00
Matthew Fritze
af054e63e0 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev 
am: 4bd0f411ce

Change-Id: I680a407f9955e74b66e5c87af6b8a8d4335c530d
 2017-05-17 18:50:28 +00:00
TreeHugger Robot
3abeba07d3 Merge "Remove duplicates from sound settings" into oc-dev 2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev 2017-05-17 18:28:35 +00:00
Kenny Guy
31457d5a2a Merge "Disable managed profile version of shortcut picker." into oc-dev am: c760135f14 
am: 020dd7b169

Change-Id: I8acfa1dd9e19cf7ad31cadae047cf44f6d88dcc8
 2017-05-17 17:53:40 +00:00
Matthew Fritze
256e9e208e Merge "Remove Network Restrictions duplicate from setting search" into oc-dev am: 09dbc8043f 
am: d53409356d

Change-Id: Ia40375afa74f82a46c01aef99b95d6074fbc5324
 2017-05-17 17:53:08 +00:00
Kenny Guy
020dd7b169 Merge "Disable managed profile version of shortcut picker." into oc-dev 
am: c760135f14

Change-Id: I9df7203ba655e1f483464c0b5cbec14800919ae1
 2017-05-17 17:43:44 +00:00
TreeHugger Robot
c760135f14 Merge "Disable managed profile version of shortcut picker." into oc-dev 2017-05-17 17:38:30 +00:00
Matthew Fritze
d53409356d Merge "Remove Network Restrictions duplicate from setting search" into oc-dev 
am: 09dbc8043f

Change-Id: Ia172fc4c93b2259ed9a51248159784a89fbdf638
 2017-05-17 17:37:51 +00:00
Steven Ng
56870f438c Fix phishing attack in ChooseLockGeneric 
Cherry-pick of 436256c36d

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
 2017-05-17 18:37:01 +01:00
Matthew Fritze
f81f1024c3 Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b 
am: 70db53a8d5

Change-Id: I03de10d23f3d9a74ee08fdb6a711400e3e0468cf
 2017-05-17 17:31:08 +00:00