Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,286 Commits 1 Branch 0 Tags
8e9aef81cf2361dcf4ef661880daf6fc7072b7b4
Commit Graph

16286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
8e9aef81cf am 94f927b6: am 4e5e8a92: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev 
* commit '94f927b6d54b783651fbde770465b3a9f47468a2':
  Updated Bluetooth keyboard icon to teal.
 2014-09-11 17:24:17 +00:00
Jason Monk
becbb93a8d am a9681ddb: am 540743d4: am 062f736c: Adding zen mode condition dialog 
* commit 'a9681ddb17398ce36e24e5dae0ea483db5ad7b2f':
  Adding zen mode condition dialog
 2014-09-11 17:22:30 +00:00
Fabrice Di Meglio
75cefd093c am e384b253: am 263233b2: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev 
* commit 'e384b2534b5230d61cfb88e136528002a187533b':
  Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
 2014-09-11 17:22:19 +00:00
Baligh Uddin
330ac54067 Merge "Import translations. DO NOT MERGE" 2014-09-11 15:49:22 +00:00
John Spurlock
aa03280db7 am 2c19551e: am a2f9e2a2: am 1e7dbd45: Settings: Use the same day sequence for downtime. 
* commit '2c19551efba348e3e378159bac62980a5fbad91f':
  Settings: Use the same day sequence for downtime.
 2014-09-11 14:14:13 +00:00
John Spurlock
c46156277a am 77056e3f: am 740eeb97: am cddb2954: Settings: Make downtime days scrollable. 
* commit '77056e3f04dcacea63a7da0cbb3483e91927e3d1':
  Settings: Make downtime days scrollable.
 2014-09-11 14:14:12 +00:00
PauloftheWest
94f927b6d5 am 4e5e8a92: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev 
* commit '4e5e8a92007dded8c2ac87d61724ed2c62a14d9e':
  Updated Bluetooth keyboard icon to teal.
 2014-09-10 21:54:53 +00:00
PauloftheWest
4e5e8a9200 am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev 
* commit '8b7d27cb78b09d9b2b2f4185308a042f471276ef':
  Updated Bluetooth keyboard icon to teal.
 2014-09-10 21:44:16 +00:00
PauloftheWest
8b7d27cb78 Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev 2014-09-10 21:35:15 +00:00
PauloftheWest
85daf61bda Updated Bluetooth keyboard icon to teal. 
Bug: 17140804
Change-Id: I59a4c0ff81b723ff4676b607e3da6cdc5c73625e
 2014-09-10 14:24:11 -07:00
Jason Monk
a9681ddb17 am 540743d4: am 062f736c: Adding zen mode condition dialog 
* commit '540743d486ee58e908fa0264b3e15c2e1cc4c46d':
  Adding zen mode condition dialog
 2014-09-10 20:53:20 +00:00
Jason Monk
540743d486 am 062f736c: Adding zen mode condition dialog 
* commit '062f736c8bfda9ac6ac7476ad51e52ca077f1505':
  Adding zen mode condition dialog
 2014-09-10 20:42:47 +00:00
Jason Monk
062f736c8b Adding zen mode condition dialog 
So that when you turn on priority or none in settings, you can
select the end condition.

Depends on framework changes: I9300af4f8b6d80042452b75db3418b20c5c5cc81

Bug: 15454830
Change-Id: I7856beabdd54de2ef10fa5c3d38bf27f36014693
 2014-09-10 20:32:39 +00:00
Fabrice Di Meglio
e384b2534b am 263233b2: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev 
* commit '263233b2c3aad1723254cafe694d63596b26b8ca':
  Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
 2014-09-10 20:32:02 +00:00
Fabrice Di Meglio
263233b2c3 am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev 
* commit '877fb7fb425ed63f01a941718cea5fc263e74731':
  Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
 2014-09-10 20:22:56 +00:00
Fabrice Di Meglio
877fb7fb42 Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev 2014-09-10 20:14:15 +00:00
Fabrice Di Meglio
ade5761557 Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility 
- add missing string

Change-Id: I9c6a50353075b05d0f80d112c999b2579cdb6676
 2014-09-10 13:12:25 -07:00
John Spurlock
2c19551efb am a2f9e2a2: am 1e7dbd45: Settings: Use the same day sequence for downtime. 
* commit 'a2f9e2a2ad2edd15ea9c89ec92b4b3dc0d8bcf19':
  Settings: Use the same day sequence for downtime.
 2014-09-10 17:14:21 +00:00
John Spurlock
77056e3f04 am 740eeb97: am cddb2954: Settings: Make downtime days scrollable. 
* commit '740eeb97d73a0aa74d96da0a3309462b08da8e09':
  Settings: Make downtime days scrollable.
 2014-09-10 17:14:18 +00:00
John Spurlock
a2f9e2a2ad am 1e7dbd45: Settings: Use the same day sequence for downtime. 
* commit '1e7dbd455eade6e6d8f1abd7969dd096972ed84f':
  Settings: Use the same day sequence for downtime.
 2014-09-10 17:06:05 +00:00
John Spurlock
740eeb97d7 am cddb2954: Settings: Make downtime days scrollable. 
* commit 'cddb29544ae4b7c67c3885eda7d2a485cceb53e6':
  Settings: Make downtime days scrollable.
 2014-09-10 17:06:05 +00:00
John Spurlock
1e7dbd455e Settings: Use the same day sequence for downtime. 
Make the starting day (Monday) the same between
the selection dialog and the summary text.

Bug:17390052

Change-Id: I4f884cb5e02c1cc2642ab05915cd94c655b9f362
 2014-09-10 11:57:46 -04:00
John Spurlock
cddb29544a Settings: Make downtime days scrollable. 
Bug:17428288
Change-Id: I389aece9d79d002426a0bcb03d4a523293012892
 2014-09-10 10:04:44 -04:00
Matthew Xie
0da2d7561c am cc95d3f7: am 5cb10679: am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev 
* commit 'cc95d3f7e14176a0dcdc48666a5e4627fa7c5b25':
  Do not remove bonded devices from cached device list upon a device scan
 2014-09-10 01:58:09 +00:00
Carlos Valdivia
97dae23d6c am 80326775: am 5db29283: am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev 
* commit '80326775dfc21854b25fe64770da38dc9bf2ca64':
  SECURITY: Prevent preference intents from exploiting settings.
 2014-09-10 01:56:41 +00:00
Matthew Xie
cc95d3f7e1 am 5cb10679: am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev 
* commit '5cb10679f9c1133d46d38a6137297af909ecb9ad':
  Do not remove bonded devices from cached device list upon a device scan
 2014-09-10 01:12:02 +00:00
Matthew Xie
5cb10679f9 am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev 
* commit '72e5583d2a9af10f2750e9abd23c3d5400e3c789':
  Do not remove bonded devices from cached device list upon a device scan
 2014-09-10 00:56:07 +00:00
Carlos Valdivia
80326775df am 5db29283: am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev 
* commit '5db2928351f3bc37a7a31537f480753456ed3b68':
  SECURITY: Prevent preference intents from exploiting settings.
 2014-09-10 00:52:02 +00:00
Matthew Xie
72e5583d2a Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev 2014-09-10 00:48:41 +00:00
Carlos Valdivia
5db2928351 am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev 
* commit 'af85b740461b69d9b52d6d19a81d06f3a15b6507':
  SECURITY: Prevent preference intents from exploiting settings.
 2014-09-10 00:22:36 +00:00
Carlos Valdivia
af85b74046 Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev 2014-09-10 00:16:16 +00:00
Elliott Hughes
2f696300b9 am ebd410e5: am 38a8fa2e: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev 
* commit 'ebd410e529c8dc249ce80bab86e178fe4de8fe27':
  Always use the LocalePicker's preferred locale names.
 2014-09-09 22:21:49 +00:00
Matthew Xie
b17031bed0 Do not remove bonded devices from cached device list upon a device scan 
Bug: 17405122

Change-Id: I3f5cc6ddc8f85d3b6223f9ff60e1d5eeb76c530a
 2014-09-09 15:12:43 -07:00
Elliott Hughes
ebd410e529 am 38a8fa2e: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev 
* commit '38a8fa2e48b79c881f876af8640608cfdc648363':
  Always use the LocalePicker's preferred locale names.
 2014-09-09 22:09:19 +00:00
Jorim Jaggi
46bd010464 am b0ee68d5: am 5c202a51: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 
* commit 'b0ee68d5dad943000168fa9eb5910d69af737168':
  Fix layout issues with landscape pattern/password layouts
 2014-09-09 22:07:23 +00:00
PauloftheWest
9a1626c1f0 am a6b9eaaf: am a547bb99: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 
* commit 'a6b9eaafbb88d556b8cdcbb5ad10dc8b83b3a0f4':
  Fixed a Null Pointer Error in Bluetooth Settings.
 2014-09-09 22:07:22 +00:00
Amith Yamasani
87c5261558 am 942102ef: am e7f89b6b: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev 
* commit '942102efd3f9208ee2c3df16d0dd089201dedbf1':
  Handle disallowed NFC beam restriction
 2014-09-09 22:07:19 +00:00
Adam Lesinski
e42add8915 am 2554ccc9: am caf1be66: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev 
* commit '2554ccc9e2e64d59ae4589a9740185d13e4b7087':
  Make UsageAccess WarningDialog actually instatiatable.
 2014-09-09 22:07:18 +00:00
Jorim Jaggi
b0ee68d5da am 5c202a51: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 
* commit '5c202a51b9598a7a1bd302a5b2d04dd751a72b3c':
  Fix layout issues with landscape pattern/password layouts
 2014-09-09 21:57:01 +00:00
PauloftheWest
a6b9eaafbb am a547bb99: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 
* commit 'a547bb9940e38c6dd60eb998f17a17c26e350bbf':
  Fixed a Null Pointer Error in Bluetooth Settings.
 2014-09-09 21:56:23 +00:00
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
Amith Yamasani
942102efd3 am e7f89b6b: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev 
* commit 'e7f89b6bfc5d3aeaa6ce1d330e5d7872ed87168d':
  Handle disallowed NFC beam restriction
 2014-09-09 21:55:55 +00:00
Adam Lesinski
2554ccc9e2 am caf1be66: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev 
* commit 'caf1be66d1676df9796274f8eaed4c334774f15e':
  Make UsageAccess WarningDialog actually instatiatable.
 2014-09-09 21:55:54 +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
PauloftheWest
a547bb9940 am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 
* commit '654517a510dd4f655a468ad0083d04929338a7df':
  Fixed a Null Pointer Error in Bluetooth Settings.
 2014-09-09 20:51:57 +00:00
PauloftheWest
654517a510 Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 2014-09-09 20:45:59 +00:00