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

29926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Bill Yi
871fd84ab3 Import translations. DO NOT MERGE am: 4bfccb32a7 -s ours am: 4559d2bfac -s ours 
am: d0c5d246c8  -s ours

Change-Id: Ic8230d57c512c2ccbc54be5061caac490bcbe6d4
 2016-10-20 16:41:12 +00:00
Bill Yi
d0c5d246c8 Import translations. DO NOT MERGE am: 4bfccb32a7 -s ours 
am: 4559d2bfac  -s ours

Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d
 2016-10-20 16:33:20 +00:00
Bill Yi
4559d2bfac Import translations. DO NOT MERGE 
am: 4bfccb32a7  -s ours

Change-Id: I7c16649111b0057307773f7674c11c1aa9732c4c
 2016-10-20 16:25:35 +00:00
Bill Yi
e41b0705ee Import translations. DO NOT MERGE am: 7e6e9220da -s ours 
am: d5bc80036b  -s ours

Change-Id: I147e0e6546f7d367ff81d45bc66e7829bcf45267
 2016-10-20 16:25:23 +00:00
Bill Yi
d5bc80036b Import translations. DO NOT MERGE 
am: 7e6e9220da  -s ours

Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748
 2016-10-20 16:17:21 +00:00