PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,796 Commits 1 Branch 0 Tags
a2689db7f93b2df088a0ee071c64a2d56e37f8be
Commit Graph

5695 Commits

Author SHA1 Message Date
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
a82605dc42 am 0ed54bff: am 7413c1fa: am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit '0ed54bffede9f7e2b9cd98c2425cd8d2c68978bd':
  Update Trusted Credentials screen in settings
 2014-09-09 15:03:52 +00:00
Zoltan Szatmary-Ban
dbcfc1b736 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:27 +00: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
Baligh Uddin
2acd6aeced Import translations. DO NOT MERGE 
Change-Id: Iad5365cc40b0101b19c851aa3ed1f1431ba5fdc5
Auto-generated-cl: translation import
 2014-09-08 22:54:40 -07:00
Baligh Uddin
ce59f5cfcd Import translations. DO NOT MERGE 
Change-Id: I20034afe71fda554c3139ad8e56df1fa7ae1ffd4
Auto-generated-cl: translation import
 2014-09-08 22:43:25 -07:00
Baligh Uddin
7cfae9df9e Import translations. DO NOT MERGE 
Change-Id: I218cab3789ccb371b7ca9cd77388932b88ec5ab1
Auto-generated-cl: translation import
 2014-09-08 22:39:52 -07:00
Elliott Hughes
fa13725d12 am 8a71e343: am 15a2e89a: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 
* commit '8a71e3436f4230551c0839cb7eeba44478d04dc2':
  Start cleaning up percentage formatting in Settings.
 2014-09-09 00:00:01 +00:00
Elliott Hughes
bce031b0ad 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:40:42 +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
6eccc85e94 am 36dbcdea: am 8e476892: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev 
* commit '36dbcdeaf6b94f50de6333c2e509d5a63ba52a65':
  Fixed scrolling on the Wi-Fi Settings Dialog.
 2014-09-08 23:10:51 +00:00
PauloftheWest
5dcec20557 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:54:05 +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
23f77701be am 640a429d: am c6e1cc20: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev 
* commit '640a429d513fb6c7b342c9166a911e02727b744d':
  Material theme updates for Wifi Dialog.
 2014-09-08 22:35:26 +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
9128659be8 am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev 
* commit 'd0db988bb635975a366654099fe1ac559283161f':
  Material theme updates for Wifi Dialog.
 2014-09-08 22:08:40 +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
1603ff70c8 am 2aeb4c2d: am 2e3d6d38: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev 
* commit '2aeb4c2dfb5dc1b98a725362923adf0209085868':
  prettify the wifi verbose logging string
 2014-09-08 19:51:23 +00: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
4d5ddf0cce 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:26 +00:00
vandwalle
b6854480d4 prettify the wifi verbose logging string 
Bug:15168065

Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
 2014-09-07 22:03:19 -07:00
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
5437b488cb 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:01:09 +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
60b7e88289 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:15:01 +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
2ed0ea2120 am 0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev 
* commit '0a59607e5eea0e94542edb8de533ccb8e258536b':
  Implement per-app sensitivity settings toggle.
 2014-09-04 21:04:07 +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
db9745e43a 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:42:33 +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
184a7b4fd3 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-04 18:34:44 +00:00
Baligh Uddin
004e93fed2 Merge "Import translations. DO NOT MERGE" 2014-09-04 18:34:42 +00:00