PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,949 Commits 1 Branch 0 Tags
f13181585944cd65d7482a2d2d67cdbc042c0d65
Commit Graph

29949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
f131815859 Import translations. DO NOT MERGE 
am: 5a05a8a4ea  -s ours

Change-Id: Ia227c18a81391b0609518b9a68001598bd389191
 2016-12-01 19:07:44 +00:00
Bill Yi
5a05a8a4ea Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ib08dd2e3c6b87cc0fbdc16bb167f4e167e52b020
 2016-12-01 10:11:25 -08:00
Amin Shaikh
7c8af0aedc Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e 
am: 3140bb5ace

Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001
 2016-12-01 02:21:13 +00:00
Amin Shaikh
3140bb5ace Merge "Refactor NetworkScoreAppManager for testing." 
am: 512368a22e

Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
 2016-12-01 02:11:06 +00:00
Treehugger Robot
512368a22e Merge "Refactor NetworkScoreAppManager for testing." 2016-12-01 01:59:14 +00:00
Stephen Chen
701e558586 Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5 
am: 539eaa34d5

Change-Id: I32a45ccc9a08d8f90e8801f727853fc320db9dc5
 2016-12-01 00:09:32 +00:00
Stephen Chen
539eaa34d5 Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." 
am: 666c9d7ea5

Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2
 2016-11-30 23:59:43 +00:00
Treehugger Robot
666c9d7ea5 Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." 2016-11-30 20:25:13 +00:00
Amin Shaikh
f91ac62756 Refactor NetworkScoreAppManager for testing. 
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
 2016-11-29 10:17:34 -08:00
Stephen Chen
e365aa8cd9 Link WIFI_SAVED_NETWORK_SETTINGS action with activity. 
Bug: 32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287
 2016-11-28 16:29:31 -08:00
Fan Zhang
b69ec294c2 Fix crash when opening account sync detail for external app am: c9cdc25f41 
am: f3e86ca481

Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a
 2016-11-23 23:29:22 +00:00
Bill Yi
5cca5a64e8 Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours 
am: 4666b50754  -s ours

Change-Id: I1aaca58936606507f763770e65dace147da5153a
 2016-11-23 23:29:07 +00:00
Bill Yi
57b56329f3 Import translations. DO NOT MERGE am: e7f9b0b30b -s ours 
am: f8b4927683  -s ours

Change-Id: I4be07f881fd515c3668c12ecab6d2af8452d1ec0
 2016-11-23 23:28:53 +00:00
Steven Ng
26a3c28735 Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495 
am: 046a63450f

Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4
 2016-11-23 23:28:38 +00:00
Bill Yi
71a0bb85a5 Import translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours 
am: f8032d0b15  -s ours

Change-Id: I0c7f588a8868df3a7235dbbac1eff725dc591070
 2016-11-23 23:28:25 +00:00
Bill Yi
88b043714b Import translations. DO NOT MERGE am: 475763d01c -s ours 
am: 9a22968ff8  -s ours

Change-Id: Ic98ab45a4b2e31007a18e7018ad5f31c2b82d2ae
 2016-11-23 23:28:12 +00:00
Bill Yi
9e17133192 Import translations. DO NOT MERGE 
am: 001632d55c  -s ours

Change-Id: Ib267ac961a6ef99c9c1401e8967725b0f7914bac
 2016-11-21 01:28:26 +00:00
Bill Yi
001632d55c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Id8af490796464cb8422fa4be023af34baee73002
 2016-11-20 16:12:14 -08:00
Jerry Zhang
3473bc219e Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am: 89a055aa9d 
am: 1451a4af78

Change-Id: I90048a233d80ee023e9f775b540248b62aa5e4ea
 2016-11-17 00:24:57 +00:00
Jerry Zhang
fd764ac0e3 Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f 
am: a75fa91247

Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6
 2016-11-17 00:24:50 +00:00
Jerry Zhang
1451a4af78 Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" 
am: 89a055aa9d

Change-Id: I8bad2864a848b46c99e2693acacb320615338ec8
 2016-11-17 00:12:59 +00:00
Jerry Zhang
a75fa91247 Refactor setCurrentFunction and setUsbDataUnlocked into one method 
am: a1b60e629f

Change-Id: I0ed28df5f24e7fe545f968c4d65cfc0494b57ebd
 2016-11-17 00:09:38 +00:00
Jerry Zhang
89a055aa9d Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" 2016-11-16 23:59:33 +00:00
Sohani Rao
6cebca2599 Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 
am: 6f126a8f5c

Change-Id: I327d6c864ce58c21a74d628d1945f86ff518234c
 2016-11-14 21:21:49 +00:00
Sohani Rao
6f126a8f5c Merge "Add WiFi toggle prompts - settings" 
am: b4b2c2aa43

Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a
 2016-11-14 21:14:54 +00:00
Sohani Rao
b4b2c2aa43 Merge "Add WiFi toggle prompts - settings" 2016-11-14 20:59:36 +00:00
Svetoslav Ganov
e06767af78 Add WiFi toggle prompts - settings 
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Bug: 28715749
Test: Unit tests
Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Merged-In: I10d1231ea0c47eec5993dbe367cc0c245cba9385
 2016-11-14 10:32:39 -08:00
Juan Flores
16455893d7 Merge "Fix crash while searching in Settings" am: 176c0c5d98 
am: d705a333ca

Change-Id: I31732b822a80caa52cb97c43ea093dea8c0b19cb
 2016-11-02 16:45:03 +00:00
Juan Flores
d705a333ca Merge "Fix crash while searching in Settings" 
am: 176c0c5d98

Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1
 2016-11-02 16:42:03 +00:00
Treehugger Robot
176c0c5d98 Merge "Fix crash while searching in Settings" 2016-11-02 16:37:08 +00:00
Fan Zhang
f3e86ca481 Fix crash when opening account sync detail for external app 
am: c9cdc25f41

Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
 2016-11-01 17:21:36 +00:00
Fan Zhang
c9cdc25f41 Fix crash when opening account sync detail for external app 
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c3)
 2016-10-31 21:57:36 +00:00
Paul Stewart
dab924f04d Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c 
am: 27c5edb968

Change-Id: I427261d397f0003f1e4eecd55d431441303e4b4c
 2016-10-28 21:09:38 +00:00
Paul Stewart
27c5edb968 Merge "Don't display an invalid Wi-Fi MAC address" 
am: 917b7b863c

Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
 2016-10-28 21:04:40 +00:00
Treehugger Robot
917b7b863c Merge "Don't display an invalid Wi-Fi MAC address" 2016-10-28 20:56:35 +00:00
Marie Janssen
6e8a67c008 Merge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours 
am: ce2a10b743

Change-Id: If2a0712b38cfd85af1502e68bdda39d1be8735b6
 2016-10-28 02:52:12 +00:00
Marie Janssen
ce2a10b743 Merge "Add Bluetooth toggle prompts - settings" 
am: de037d5491  -s ours

Change-Id: I4d809fb02c07ad366b6e5954ac3c0dbc0f5c597d
 2016-10-28 02:45:39 +00:00
Marie Janssen
de037d5491 Merge "Add Bluetooth toggle prompts - settings" 2016-10-27 23:07:31 +00:00
Paul Stewart
1aeb383d73 Don't display an invalid Wi-Fi MAC address 
Only display the WifiInfo MAC address if it is a valid address.
Otherwise, display "Unavailable".  The underlying WifiInfo class
now has a default value, and a method that can be used to test
whether or not the contained address is valid.  This change uses
this test and avoids having the confusing default address displayed.

Bug: 32478606
Test: Manual: Turn off WiFi and reboot -- make sure "Unavailable"
      is displayed as the Wi-Fi MAC Address as opposed to "02:00:00:00:00:00"

Change-Id: I912804eb65735375e0ca3c4618a6399543f33b57
 2016-10-27 13:34:10 -07:00
Bill Yi
4666b50754 Import translations. DO NOT MERGE am: bb6af9902d -s ours 
am: 061b294714  -s ours

Change-Id: If6f1925ffdab47128db255040e97a45733f819d5
 2016-10-27 05:27:37 +00:00
Bill Yi
f8b4927683 Import translations. DO NOT MERGE 
am: e7f9b0b30b  -s ours

Change-Id: I4297eed21e6b8854801a3e9a6f9904b1dadaab72
 2016-10-27 05:27:22 +00:00
Bill Yi
061b294714 Import translations. DO NOT MERGE 
am: bb6af9902d  -s ours

Change-Id: I601e2eb4a89830873bee3f05b77d90b0e9dff9bb
 2016-10-27 05:22:55 +00:00
Bill Yi
bb6af9902d Import translations. DO NOT MERGE 
Change-Id: Ie7733c16a2d1b8502a2b33e10fe0c4fa0e6d9138
Auto-generated-cl: translation import
 2016-10-26 21:04:20 -07:00
Bill Yi
e7f9b0b30b Import translations. DO NOT MERGE 
Change-Id: I593dba1b6fda93a08279272c8e4061c464899afc
Auto-generated-cl: translation import
 2016-10-26 20:51:47 -07:00
Svetoslav Ganov
13088cac84 Add Bluetooth toggle prompts - settings 
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
(cherry picked from commit b06766f129)
 2016-10-26 13:30:38 -07:00
Steven Ng
046a63450f Nexus imprint setting is missing while adding corp account from SUW 
am: 378dec1495

Change-Id: I829c9738c70ec8242fb2c3fdcf7eecd5ff39df7c
 2016-10-25 22:15:03 +00:00
Steven Ng
378dec1495 Nexus imprint setting is missing while adding corp account from SUW 
+ This is caused by the encryption interstitial result code not handled
  in ChooseLockGeneric. Change the request code of launching encryption
  interstitial screen to CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST if it
  is set new password flow.

Testing
Test: See below
1) Auto
   make RunSettingsRoboTests
2) Manual
   On a device (Nexus 5x) that shows encryption interstital screen and
   supports fingerprint.
   1) Nexus imprint flow (regression test)
      Fingerprint can be enrolled with the following flow.
      Settings > Security > Nexus Imprint > FingerprintEnrollIntroduction
      > ChooseLockGeneric (Unlock selection) > Encryption Interstitial
      > Password setup > Notification Interstitial
      > Find sensor and fingerprint enrollment
   2) Set new password test
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Nexus Imprint + Pattern.
      iii) Choose "Require pattern to start device"
      iv) Set a pattern lock.
      v) Choose any of the notification behavior.
      vi) Can enroll a fingerprint.

Bug: 32382952

Change-Id: Ie66ffca2e8c3cc46b5e8b619bd35986e4f41d5ab
 2016-10-25 20:01:23 +00:00
Jerry Zhang
a1b60e629f Refactor setCurrentFunction and setUsbDataUnlocked into one method 
This allows us to get rid of an extraneous config switch and
simplify some code.

Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit 5d36a177d9)
 2016-10-25 11:02:21 -07:00
Bill Yi
f8032d0b15 Import translations. DO NOT MERGE am: a6d9842695 -s ours 
am: c027907edc  -s ours

Change-Id: I09c421885fb40a57e309a083413797bac5de053b
 2016-10-25 06:30:52 +00:00
Bill Yi
9a22968ff8 Import translations. DO NOT MERGE 
am: 475763d01c  -s ours

Change-Id: I4b54504ffad69e916590de47d505979b82325827
 2016-10-25 06:30:37 +00:00