Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,931 Commits 1 Branch 0 Tags
09797c330c0f5f0f88b16cc01f95ae9c7e8e1d8b
Commit Graph

29931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Stewart
09797c330c Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c am: 27c5edb968 
am: dab924f04d

Change-Id: I06bad134648c70f432194e163a8e0a5829f514f0
 2016-10-28 21:14:38 +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
cd9d948d7e Merge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours am: ce2a10b743 
am: 6e8a67c008

Change-Id: I0fc40f9a3f3a8488e696727d08084f2d2b9d2d75
 2016-10-28 02:57:06 +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
10d6c409d4 Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours am: 4666b50754 -s ours 
am: 69e4232f8d  -s ours

Change-Id: Icedc51c61aa4c3b8aa80016617e9e6fc8ebf72fa
 2016-10-27 05:36:09 +00:00
Bill Yi
65d4378a8f Import translations. DO NOT MERGE am: e7f9b0b30b -s ours am: f8b4927683 -s ours 
am: f55f67e409  -s ours

Change-Id: I650772657134b60a80f91d2dd0f5d740233aecbc
 2016-10-27 05:35:55 +00:00
Bill Yi
69e4232f8d Import translations. DO NOT MERGE am: bb6af9902d -s ours am: 061b294714 -s ours 
am: 4666b50754  -s ours

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

Change-Id: I9d28fc31d3dc6ead839e36b000d16cec353562fd
 2016-10-27 05:31:24 +00: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
bcbb9ca8c7 Import translations. DO NOT MERGE 
am: 06f30f99c0  -s ours

Change-Id: I573f6294350759b53b9c12c3a21cd2b571393b2a
 2016-10-27 04:56:50 +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
06f30f99c0 Import translations. DO NOT MERGE 
Change-Id: I51115d580c3d823482a01f078fd23b2690f3899b
Auto-generated-cl: translation import
 2016-10-26 20:59:24 -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
dd83a65e88 Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495 am: 046a63450f 
am: bde2c59f00

Change-Id: Ie6c4a37d9aaaf9cba94c6fc050600f8acf13f53e
 2016-10-25 22:23:35 +00:00
Steven Ng
bde2c59f00 Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495 
am: 046a63450f

Change-Id: I3a393fb00ab8f312ca078b08feb42decb106fb81
 2016-10-25 22:19:05 +00: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
Bill Yi
215732141f Import translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours am: f8032d0b15 -s ours 
am: 79d7ca6010  -s ours

Change-Id: Icc5f7f210bd15607918cf967b0e5e47952034e25
 2016-10-25 06:48:05 +00:00
Bill Yi
6ac5336104 Import translations. DO NOT MERGE am: 475763d01c -s ours am: 9a22968ff8 -s ours 
am: 44ab95f758  -s ours

Change-Id: Ic439351fb3ab9c1153fba758b2c4ebe229e04ff3
 2016-10-25 06:47:51 +00:00
Bill Yi
a6815674fb Import translations. DO NOT MERGE 
am: 9351e5f083  -s ours

Change-Id: I4c60ee71fe030300677212e0897a204b7f29b463
 2016-10-25 06:47:27 +00:00
Bill Yi
79d7ca6010 Import translations. DO NOT MERGE am: a6d9842695 -s ours am: c027907edc -s ours 
am: f8032d0b15  -s ours

Change-Id: I08630831bbe4204fd9a86c30e9710abea02cb78c
 2016-10-25 06:38:04 +00:00
Bill Yi
44ab95f758 Import translations. DO NOT MERGE am: 475763d01c -s ours 
am: 9a22968ff8  -s ours

Change-Id: Id515f8c57aeb9c6a478d025b4a7223acb8163b72
 2016-10-25 06:37:49 +00: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
Bill Yi
c027907edc Import translations. DO NOT MERGE 
am: a6d9842695  -s ours

Change-Id: Ic902f00f1abc643ecfb2e567d7368815bf727d62
 2016-10-25 06:30:08 +00:00
Bill Yi
a6d9842695 Import translations. DO NOT MERGE 
Change-Id: Ic23d8689a23264722dd70856138fbda6a214e7cb
Auto-generated-cl: translation import
 2016-10-24 12:40:25 -07:00
Bill Yi
9351e5f083 Import translations. DO NOT MERGE 
Change-Id: I75261b567ac55ce6adfbcdadb63a058dfeac9bda
Auto-generated-cl: translation import
 2016-10-24 12:35:20 -07:00
Bill Yi
475763d01c Import translations. DO NOT MERGE 
Change-Id: Ie8400c22cf5931503997d0dc93b0358ee40c89d7
Auto-generated-cl: translation import
 2016-10-24 12:27:49 -07:00
Doris Ling
12ffd7aaa7 Ensure that the gesture animation video is paused properly. am: 4245ad4771 
am: 5e4fce04fb

Change-Id: Ic615738b57a4ca49f5c6101e86aea03dbf0f9a12
 2016-10-21 23:46:51 +00:00
Doris Ling
5e4fce04fb Ensure that the gesture animation video is paused properly. 
am: 4245ad4771

Change-Id: Ib6bd653fe0f1fd0859c37df4655908e67ecc4444
 2016-10-21 23:44:19 +00:00
Doris Ling
4245ad4771 Ensure that the gesture animation video is paused properly. 
Add the handling to pause the animation video when user navigates away
from the gesture settings.

Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix: 32064123

Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17
 2016-10-21 14:28:54 -07:00
Matthew Fritze
1f8073efb9 Merge "Support tile title text line wraps" into nyc-mr1-dev am: f5cd60372c 
am: 2da1ca120f

Change-Id: Ic447e8fbf664140f2580c4898e2a0b6618585543
 2016-10-21 16:46:00 +00:00
Matthew Fritze
86c8b2a1a5 Support tile title text line wraps am: 0f813d668d 
am: 0e0e6c5544

Change-Id: I81fa4356f76b2693eca95ff5c79c6168a68ffd64
 2016-10-21 16:45:40 +00:00
Matthew Fritze
2da1ca120f Merge "Support tile title text line wraps" into nyc-mr1-dev 
am: f5cd60372c

Change-Id: Ie0d699bcc355519060df04b46b213ce368e47e6a
 2016-10-21 16:36:20 +00:00
Matthew Fritze
0e0e6c5544 Support tile title text line wraps 
am: 0f813d668d

Change-Id: I47a4f7f95f0bce43a55e661209d48142f82e5b42
 2016-10-21 16:36:19 +00:00
TreeHugger Robot
f5cd60372c Merge "Support tile title text line wraps" into nyc-mr1-dev 2016-10-21 16:30:50 +00:00
Matthew Fritze
0f813d668d Support tile title text line wraps 
Change-Id: Ice430d03877618aacad21e5ee6167516f60f02fd
Fixes: 32239411
Test: Manual
 2016-10-20 17:50:11 -07:00
Fan Zhang
b04bd44378 Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am: 08254e5b4f 
am: 723fbd06a9

Change-Id: Ief7d0f6e9d90c34f8b9405d4d13c4080f669c15c
 2016-10-20 20:34:04 +00:00
Fan Zhang
dd387b6739 Fix help & feedback link in data usage summary screen. am: 9b52836251 
am: 7568e120cf

Change-Id: If7768bdf34204ca158dcf7e2078826a0aabc2ec7
 2016-10-20 20:33:51 +00:00
Fan Zhang
723fbd06a9 Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev 
am: 08254e5b4f

Change-Id: Ia9c30a0a03a1dcaec42573c3578f5a1ed80aa9b6
 2016-10-20 20:25:38 +00:00
Fan Zhang
7568e120cf Fix help & feedback link in data usage summary screen. 
am: 9b52836251

Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674
 2016-10-20 20:25:37 +00:00
TreeHugger Robot
08254e5b4f Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev 2016-10-20 20:18:44 +00:00