Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,172 Commits 1 Branch 0 Tags
92a182acca349e6bdc736164dffbc3000fa652eb
Commit Graph

5295 Commits

Author SHA1 Message Date
PauloftheWest
233fae437d am 8c138ea3: am 205a812a: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 
* commit '8c138ea357210fa22504367f9d7b8043d13cfa6b':
  Material design updates for Bluetooth Settings dialog.
 2014-09-05 22:09:31 +00:00
PauloftheWest
205a812ae3 am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 
* commit 'c7fafa25c20bfdebe765227bbc135b4b4ec89be3':
  Material design updates for Bluetooth Settings dialog.
 2014-09-05 21:00:57 +00:00
PauloftheWest
c7fafa25c2 Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 2014-09-05 20:48:56 +00:00
PauloftheWest
8677d04512 Material design updates for Bluetooth Settings dialog. 
Bug: 17140512
Change-Id: I93dd89c3f12d8abe2041dd68faef8daf981252fb
 2014-09-05 10:29:17 -07:00
Jorim Jaggi
1772e32025 am 9a8887e0: am c4dbac06: am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev 
* commit '9a8887e0a191e9dbf95126df9ed80ce815298b27':
  Remove weird divider from confirm_lock_pattern
 2014-09-05 17:24:34 +00:00
Jorim Jaggi
c4dbac0613 am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev 
* commit 'f7cdbc3a68fc5a900b3d2f2d910b2990410737db':
  Remove weird divider from confirm_lock_pattern
 2014-09-05 16:14:45 +00:00
Jorim Jaggi
d3a2ec0cbb Remove weird divider from confirm_lock_pattern 
Bug: 16686614
Change-Id: I5b62a220181e384328a3b27e05a218a5984e23d1
 2014-09-05 17:56:17 +02:00
Chris Wren
b596855853 am d21d8b3d: am 15230e79: am 0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit 'd21d8b3dc0aa159cb4c2c3b6cb6e59efd80a2832':
  Implement per-app sensitivity settings toggle.
 2014-09-04 21:28:18 +00:00
Chris Wren
15230e79b4 am 0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit '0a59607e5eea0e94542edb8de533ccb8e258536b':
  Implement per-app sensitivity settings toggle.
 2014-09-04 21:07:35 +00:00
Chris Wren
0a59607e5e Merge "Implement per-app sensitivity settings toggle." into lmp-dev 2014-09-04 20:38:40 +00:00
Andres Morales
2d614b92a3 am 2f41e0b3: am 13a0e67a: am 5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev 
* commit '2f41e0b3eb7086c627aa1aff1634b624bfad8d2b':
  New black drawables for tap and pay
 2014-09-04 19:59:50 +00:00
Andres Morales
13a0e67a01 am 5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev 
* commit '5c9a3b0d87ef4dc1b82edac191fbc6e8101aaad6':
  New black drawables for tap and pay
 2014-09-04 19:43:29 +00:00
Andres Morales
5c9a3b0d87 Merge "New black drawables for tap and pay" into lmp-dev 2014-09-04 19:31:57 +00:00
Andres Morales
7c5d31f8e7 New black drawables for tap and pay 
Much more visible than the white ones on a white bg

Bug:17155785
Change-Id: I1c135ca819ee6734289777b3e694c7548777cb84
 2014-09-04 12:11:26 -07:00
Baligh Uddin
87c7cec8ea Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 18:34:46 +00:00
Baligh Uddin
004e93fed2 Merge "Import translations. DO NOT MERGE" 2014-09-04 18:34:42 +00:00
PauloftheWest
995d4377fe am d5dc8b35: am 8c5140c0: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 
* commit 'd5dc8b3567d22fa2c10282ae95bf2653087299b9':
  Material theme updates for Bluetooth Device picker.
 2014-09-04 18:25:05 +00:00
PauloftheWest
59b958df11 am d751cad9: am 86fa459e: am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev 
* commit 'd751cad9f7b69f150a3f106690477d326b087fc0':
  Fix the truncating of Bluetooth icons.
 2014-09-04 18:15:22 +00:00
PauloftheWest
8c5140c0ab am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 
* commit '0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7':
  Material theme updates for Bluetooth Device picker.
 2014-09-04 18:00:57 +00:00
PauloftheWest
86fa459e98 am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev 
* commit '92de681ec31315bc0fd3deacf8166b2ba45cdbb1':
  Fix the truncating of Bluetooth icons.
 2014-09-04 17:51:01 +00:00
PauloftheWest
0e73c521bd Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 2014-09-04 17:50:00 +00:00
PauloftheWest
92de681ec3 Merge "Fix the truncating of Bluetooth icons." into lmp-dev 2014-09-04 17:34:17 +00:00
Fabrice Di Meglio
bfd6892818 am f52f4da3: am b876576a: am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 
* commit 'f52f4da309a78c80b598b8e53d28cacc6dc9f334':
  Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings
 2014-09-04 17:33:18 +00:00
PauloftheWest
e32220eedc Material theme updates for Bluetooth Device picker. 
Bug: 17303554
Change-Id: I6eba8654ffb95ff6a9e31c43f8e2ba93df79280d
 2014-09-04 10:16:09 -07:00
Fabrice Di Meglio
b876576a49 am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 
* commit '5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6':
  Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings
 2014-09-04 17:11:21 +00:00
Fabrice Di Meglio
5a8a75d98b Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 2014-09-04 17:01:16 +00:00
Chris Wren
3d903185c7 Implement per-app sensitivity settings toggle. 
Change-Id: Iaa1de63b720bf93bdf432117604740e509fe3ab0
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug: 16324353
 2014-09-04 11:37:18 -04:00
PauloftheWest
a7aef13fbb Fix the truncating of Bluetooth icons. 
Bug: 17347150
Change-Id: Iad6bec51bf9327ee0c6752ddaa161aec3b4ff590
 2014-09-04 08:27:32 -07:00
Chris Wren
453b48b539 am bd59090f: am 0388a7fa: am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle." 
* commit 'bd59090fa4fdf42802a752df41889b73980a7b27':
  missing dep.  Revert "Implement per-app sensitivity settings toggle."
 2014-09-04 14:17:46 +00:00
Chris Wren
aee00e1708 am a3dccd0c: am 264e942c: am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit 'a3dccd0c39ef0ec1e8af5294ea12ec9415b21543':
  Implement per-app sensitivity settings toggle.
 2014-09-04 14:08:01 +00:00
Chris Wren
0388a7fa54 am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle." 
* commit 'ee846f8828f9e2988e646af85da55f3d51c02f27':
  missing dep.  Revert "Implement per-app sensitivity settings toggle."
 2014-09-04 13:57:36 +00:00
Chris Wren
ee846f8828 missing dep. Revert "Implement per-app sensitivity settings toggle." 
This reverts commit 56131de741.

Change-Id: I409dbf4495f95ff37d2a47168cdbc4131a80d42e
 2014-09-04 15:49:58 +02:00
Chris Wren
264e942cc2 am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit '77fdc93bcdb3ae60fe617012c6c52aa274ed331e':
  Implement per-app sensitivity settings toggle.
 2014-09-04 13:46:52 +00:00
Chris Wren
77fdc93bcd Merge "Implement per-app sensitivity settings toggle." into lmp-dev 2014-09-04 13:40:04 +00:00
PauloftheWest
cc73cc4f26 am 0564130d: am 19ae38ad: am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 
* commit '0564130d2d069aebef2c2b7d9cbf31cbb995d7b3':
  Aligned buttons on the Wi-Fi Assistant Card.
 2014-09-04 13:16:07 +00:00
PauloftheWest
19ae38adf0 am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 
* commit 'e1a164bf9be2d32da3c6154eca14230677a49283':
  Aligned buttons on the Wi-Fi Assistant Card.
 2014-09-04 12:55:26 +00:00
PauloftheWest
e1a164bf9b Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 2014-09-04 12:50:04 +00:00
Baligh Uddin
9c58032976 Import translations. DO NOT MERGE 
Change-Id: Ib8611839e18cb24f0aec456649d74a6af6015fdb
Auto-generated-cl: translation import
 2014-09-03 23:27:12 -07:00
Baligh Uddin
fac397a5bf Import translations. DO NOT MERGE 
Change-Id: I46cb4475ee4c31d33f11c15cc33f6a4a2c045bc7
Auto-generated-cl: translation import
 2014-09-03 23:11:31 -07:00
Fabrice Di Meglio
add95b1502 Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings 
- add the requested infos

Change-Id: Ib2d07f79d8c2e2c85032d7ec595055254437ba19
 2014-09-03 18:31:47 -07:00
Fabrice Di Meglio
8fdfb79a65 am 29973a7e: am c4a8a619: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev 
* commit '29973a7eb515c0987d280728ae790eaf302ac92c':
  Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
 2014-09-04 00:16:49 +00:00
PauloftheWest
56217c05cd Aligned buttons on the Wi-Fi Assistant Card. 
Bug: 17305353
Change-Id: Iffdcd9b1248dc7e6bd13c9eeca267392d2171c86
 2014-09-03 16:10:45 -07:00
Fabrice Di Meglio
c4a8a6194c am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev 
* commit '815dc2738dcb1fe8abf9e436cae3e217edc77d95':
  Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
 2014-09-03 20:13:11 +00:00
Fabrice Di Meglio
815dc2738d Merge "Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'" into lmp-dev 2014-09-03 20:00:25 +00:00
Fabrice Di Meglio
28c6769c03 Fix bug #17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More' 
- revert to the correct string for the Preference screen title.

Change-Id: I17c58485875e71e5785d5879b60aebcf6c4d454a
 2014-09-03 12:57:25 -07:00
Chris Wren
56131de741 Implement per-app sensitivity settings toggle. 
Change-Id: I0e70e6ce5c4a56d738c1850c50c2e268296d9d92
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug: 16324353
 2014-09-03 15:47:08 -04:00
PauloftheWest
4cef6be766 am ef895ed2: am 5029b7a9: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit 'ef895ed21e8b0b3a9b85b1689e0095a4fa9389e6':
  Fixed a crash when loading Bluetooth Settings.
 2014-09-03 09:12:33 +00:00
Jason Monk
07cdf23306 am 797f3c48: am 8069392f: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit '797f3c48532fdec5b692342a5554330755ba4778':
  Bring back auto-rotate to settings
 2014-09-03 05:02:54 +00:00
PauloftheWest
5029b7a90c am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit 'ebe496ea7b18c5d702db4beee270046e43e491ad':
  Fixed a crash when loading Bluetooth Settings.
 2014-09-02 21:38:29 +00:00
PauloftheWest
ebe496ea7b Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 2014-09-02 21:31:23 +00:00