Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,791 Commits 1 Branch 0 Tags
80326775dfc21854b25fe64770da38dc9bf2ca64
Commit Graph

5106 Commits

Author SHA1 Message Date
Elliott Hughes
38a8fa2e48 am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev 
* commit 'a6e57b88ffa2af3014a3f689e3d08c7b77c9a64d':
  Always use the LocalePicker's preferred locale names.
 2014-09-09 21:56:01 +00:00
Elliott Hughes
a6e57b88ff Merge "Always use the LocalePicker's preferred locale names." into lmp-dev 2014-09-09 21:49:39 +00:00
Elliott Hughes
81395c8f3d Always use the LocalePicker's preferred locale names. 
Without this change we have the odd situation where LocalePicker goes out of
its way to avoid saying certain things but then -- as long as there's more than
one locale for a given language -- Settings would happily report the name we'd
been avoiding. (Either because it's too specific or because it's too sensitive.)

Also remove the unused bit-rotted duplicate of the blacklist; even if we needed
to access that list directly, we should use LocalePicker's copy.

Bug: 17150708
Change-Id: I9bfa0bf9a82bebd29ba45f4cbeaabb4e78570779
 2014-09-09 14:33:11 -07:00
Jorim Jaggi
5c202a51b9 am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 
* commit 'b2bea36bb51af63a5e65cedbf49c3ccdd5a7507c':
  Fix layout issues with landscape pattern/password layouts
 2014-09-09 21:29:14 +00:00
Jorim Jaggi
b2bea36bb5 Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 2014-09-09 21:18:39 +00:00
Jorim Jaggi
8de05c57b5 Fix layout issues with landscape pattern/password layouts 
Bug: 17416448
Change-Id: I12067846b05659dc7b56fe61f872a4ba85941604
 2014-09-09 23:11:58 +02:00
Zoltan Szatmary-Ban
7413c1fae4 am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit '574db4269528c7277f6e14a44156909fdb063190':
  Update Trusted Credentials screen in settings
 2014-09-09 11:12:09 +00:00
Zoltan Szatmary-Ban
574db42695 Merge "Update Trusted Credentials screen in settings" into lmp-dev 2014-09-09 11:05:54 +00:00
Elliott Hughes
15a2e89aa8 am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 
* commit '5c0d0729b1701428d46ee7abb31f2a83d8da38ab':
  Start cleaning up percentage formatting in Settings.
 2014-09-08 23:39:56 +00:00
Elliott Hughes
5c0d0729b1 Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 2014-09-08 23:26:20 +00:00
PauloftheWest
8e47689293 am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev 
* commit 'bec89d797b6f2680c544639faed7e47573625e11':
  Fixed scrolling on the Wi-Fi Settings Dialog.
 2014-09-08 22:51:29 +00:00
PauloftheWest
bec89d797b Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev 2014-09-08 22:34:51 +00:00
PauloftheWest
c6e1cc20d8 am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev 
* commit 'd0db988bb635975a366654099fe1ac559283161f':
  Material theme updates for Wifi Dialog.
 2014-09-08 22:12:35 +00:00
PauloftheWest
d0db988bb6 Merge "Material theme updates for Wifi Dialog." into lmp-dev 2014-09-08 22:01:06 +00:00
PauloftheWest
7ac5a1e887 Fixed scrolling on the Wi-Fi Settings Dialog. 
+ When needed, scrollbars will always appear on the Wi-Fi Settings Dialog.

Bug: 17166502
Change-Id: I7f61746b505d1a1476e987571dc757d01ce636df
 2014-09-08 14:59:04 -07:00
PauloftheWest
96fef981ed Material theme updates for Wifi Dialog. 
Bug: 17014192
Change-Id: I1e5dd04199a433d8d1c5c4e4c48329e871e28db5
 2014-09-08 14:43:45 -07:00
vandwalle
2e3d6d3854 am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev 
* commit 'c187193c19cb8ad617ae85b81cb19a4d7d8fe16a':
  prettify the wifi verbose logging string
 2014-09-08 19:32:32 +00:00
vandwalle
b6854480d4 prettify the wifi verbose logging string 
Bug:15168065

Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
 2014-09-07 22:03:19 -07: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
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
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
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
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
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
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
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
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
Elliott Hughes
7253df35a0 Start cleaning up percentage formatting in Settings. 
This fixes some of the percentage formatting issues, but there are
still about ten strings with hard-coded %%s in them.

Bug: 15476051
Change-Id: I668b6b16e598425f6006f6de0005c980f613f5b2
 2014-09-03 17:04:01 -07: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