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

29946 Commits

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

Change-Id: I03a2044f78ee22bc152cabc2a3c338aacd9f37fe
 2016-11-14 19:44:02 +00:00
Bill Yi
d13efff7aa Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 32839141
Change-Id: I6145b97714693ec78cbc8b7d2235ed5830e7f714
 2016-11-14 09:50:59 -08:00
Bill Yi
d8bd462f71 Import translations. DO NOT MERGE 
am: 416fa38e75  -s ours

Change-Id: Idfc5c51e90e9ccfb84256f532250ca5cfdf2a0a1
 2016-11-05 06:44:39 +00:00
Bill Yi
416fa38e75 Import translations. DO NOT MERGE 
Change-Id: I64f7cc447bbacc64f2993230946f87258496824a
Auto-generated-cl: translation import
 2016-11-04 22:19:32 -07:00
Stephen Chen
4ba959c7c4 Add subtypes to tron logging for Wifi toggles. 
am: b21815e320

Change-Id: Ia08aa862e311dba4af08a1a76c0083519dcdeeb9
 2016-11-04 17:22:30 +00:00
Stephen Chen
b21815e320 Add subtypes to tron logging for Wifi toggles. 
For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.

Bug: 32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Merged-In: I1d4445bda2fbeb062831e6f858ccc711bff65105

Change-Id: I6b87dc10fcfe412f1c72ae944c2dd4d81da12b53
 2016-11-03 14:16:06 -07:00
Juan Flores
8510f57509 Merge "Fix crash while searching in Settings" am: 176c0c5d98 am: d705a333ca 
am: 16455893d7

Change-Id: Ic41c29b7d3ba2c90e4c375c843ea8532b236f4a4
 2016-11-02 16:47:33 +00: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
1398c4b367 Fix crash when opening account sync detail for external app am: c9cdc25f41 am: f3e86ca481 
am: ce01f167e1

Change-Id: I36a67f2241b1a4e2fc8787adb84af31209084ede
 2016-11-01 17:25:38 +00:00
Fan Zhang
ce01f167e1 Fix crash when opening account sync detail for external app am: c9cdc25f41 
am: f3e86ca481

Change-Id: I3ca70edada88ee6d7c4dde2ba7e5972233357add
 2016-11-01 17:23:38 +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
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
Juan Flores
92fa371a0b Fix crash while searching in Settings 
A crash occurrs when power button is pressed during search in Settings
due to IndexOutOfBoundsException in HeaderViewListAdapter.
When suggestions and results are cleared,
the layouts should be invisible to solve this problem.

Bug: 27913974
Test: manual - search "font" and press power button twice

Change-Id: Ia53d393e695dbb238fc4c82a3fe52ef4250d84c1
 2016-10-25 12:12:10 +09: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