PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,248 Commits 1 Branch 0 Tags
41e9007e1371f87e521a563632042a898fad577b
Commit Graph

15248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
41e9007e13 am a68b9d7b: am db3b7e4a: am 39a37163: Merge "Move over to CharSequence version of badging method." into lmp-dev 
* commit 'a68b9d7b633843a3cbf6a15a8dccec24d8f89abc':
  Move over to CharSequence version of badging method.
 2014-08-08 02:27:12 +00:00
Dianne Hackborn
fe23d48640 am 9728284f: am 02f8ee9a: am 537a0a82: Fix issue #16555033: Battery history overflowing too much 
* commit '9728284f23c7963a81487b318adc4e6f192ea527':
  Fix issue #16555033: Battery history overflowing too much
 2014-08-08 02:27:10 +00:00
PauloftheWest
0fa724c0a1 am 327b6661: am 5380f196: am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog. 
* commit '327b66619a1be472b4051ad8e5101a1551fa718e':
  Changed a Bluetooth device's settings from an activity to a dialog.
 2014-08-08 02:27:08 +00:00
Kenny Guy
a68b9d7b63 am db3b7e4a: am 39a37163: Merge "Move over to CharSequence version of badging method." into lmp-dev 
* commit 'db3b7e4a600b6ec0b0c553609dde27d492b76f4d':
  Move over to CharSequence version of badging method.
 2014-08-08 00:55:44 +00:00
Dianne Hackborn
9728284f23 am 02f8ee9a: am 537a0a82: Fix issue #16555033: Battery history overflowing too much 
* commit '02f8ee9a056a9f9144c3a150c1e65ba6be478b8a':
  Fix issue #16555033: Battery history overflowing too much
 2014-08-08 00:55:33 +00:00
PauloftheWest
327b66619a am 5380f196: am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog. 
* commit '5380f196a2495a6ebc56fd321bb1b690f604e45e':
  Changed a Bluetooth device's settings from an activity to a dialog.
 2014-08-08 00:53:31 +00:00
Kenny Guy
db3b7e4a60 am 39a37163: Merge "Move over to CharSequence version of badging method." into lmp-dev 
* commit '39a371631370cd6f150d2d67d73e2d96da7a5e18':
  Move over to CharSequence version of badging method.
 2014-08-07 21:08:24 +00:00
Dianne Hackborn
02f8ee9a05 am 537a0a82: Fix issue #16555033: Battery history overflowing too much 
* commit '537a0a82351d9671d14dccde8c9fc2a45c3c4f3a':
  Fix issue #16555033: Battery history overflowing too much
 2014-08-07 21:04:22 +00:00
Dianne Hackborn
537a0a8235 Fix issue #16555033: Battery history overflowing too much 
Use new mechanism to retrieve battery stats, now that they
can be much larger.

Make sure these will ever end up going through an IPC.

Change-Id: Ic582a61d736e24bddc905082c1565ece00fcbb29
 2014-08-07 12:19:48 -07:00
Andres Morales
f7e2346dde am b80fba05: am 2d4b3e6b: am ff150032: Merge "Don\'t wipe PST partition if OEM unlock is enabled" into lmp-dev 
* commit 'b80fba0592a2113715aa26603520afeb1f950b05':
  Don't wipe PST partition if OEM unlock is enabled
 2014-08-07 19:16:44 +00:00
Andres Morales
b80fba0592 am 2d4b3e6b: am ff150032: Merge "Don\'t wipe PST partition if OEM unlock is enabled" into lmp-dev 
* commit '2d4b3e6baf55266af606c5c8a86aa4d14c2cdeb9':
  Don't wipe PST partition if OEM unlock is enabled
 2014-08-07 19:07:03 +00:00
Kenny Guy
39a3716313 Merge "Move over to CharSequence version of badging method." into lmp-dev 2014-08-07 18:53:12 +00:00
Kenny Guy
cc2cbaf421 Move over to CharSequence version of badging method. 
Bug: 16484455
Change-Id: Ie5ee010efc439219cb71fd4241fdb798a5f4ea12
 2014-08-07 22:01:22 +01:00
PauloftheWest
5380f196a2 am 689d2ce2: Changed a Bluetooth device\'s settings from an activity to a dialog. 
* commit '689d2ce29b3093c32d1d2b70caa6fb36a4ecefcb':
  Changed a Bluetooth device's settings from an activity to a dialog.
 2014-08-07 18:40:34 +00:00
PauloftheWest
689d2ce29b Changed a Bluetooth device's settings from an activity to a dialog. 
+ Replace the “Paired bluetooth device” screen with a “Pair device” dialog
+ Add device name text field at the top
+ Replace “Unpair” list item with a “Forget" button at bottom of dialog
+ Change “Profiles” section header to “Use for”
+ Remove status under profile titles
+ Move checkboxes to left side of labels

Bug: 15719219
Change-Id: I3b0e8c82c761fae98f16508b9fd9c58aff651f80
 2014-08-07 11:31:25 -07:00
Andres Morales
2d4b3e6baf am ff150032: Merge "Don\'t wipe PST partition if OEM unlock is enabled" into lmp-dev 
* commit 'ff150032e3c369513b0ba85b09aff1d8933c7ad3':
  Don't wipe PST partition if OEM unlock is enabled
 2014-08-07 17:36:51 +00:00
Andres Morales
d4af1b3ea8 am f0fd4c2b: am 38476589: am b1e7688a: Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev 
* commit 'f0fd4c2b38c35e0e634ed621fa855df2c2ee03de':
  Prevent newlines and long captions selecting default payment app
 2014-08-07 17:22:40 +00:00
Andres Morales
f0fd4c2b38 am 38476589: am b1e7688a: Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev 
* commit '38476589584f5c8c382a98cceb27a865fa8dfe3b':
  Prevent newlines and long captions selecting default payment app
 2014-08-07 17:18:51 +00:00
Andres Morales
3847658958 am b1e7688a: Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev 
* commit 'b1e7688aef258a4cd832b363ff7db632baabd13b':
  Prevent newlines and long captions selecting default payment app
 2014-08-07 17:13:23 +00:00
Zoltan Szatmary-Ban
9e07d6eb5b am 9f6f453a: am 50946be4: am ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev 
* commit '9f6f453a74e4021abce7148ba6d654cdf173a152':
  Badge texts correctly for accessibility in Settings
 2014-08-07 13:49:20 +00:00
Zoltan Szatmary-Ban
9f6f453a74 am 50946be4: am ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev 
* commit '50946be41612f713f29041c39a1c324219c95b98':
  Badge texts correctly for accessibility in Settings
 2014-08-07 13:45:44 +00:00
Zoltan Szatmary-Ban
50946be416 am ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev 
* commit 'ec08228ea9a3713fbfac05fe211fc931992788a2':
  Badge texts correctly for accessibility in Settings
 2014-08-07 13:41:42 +00:00
Sander Alewijnse
18c1fcf73a am 400658ad: am 6173fed5: am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev 
* commit '400658ad32a7c11b172557ebfab67cf423a20db7':
  Prevent launcher switching in Settings app.
 2014-08-07 12:05:38 +00:00
Sander Alewijnse
400658ad32 am 6173fed5: am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev 
* commit '6173fed5a9afa1c410067e4840a3371b1c08490a':
  Prevent launcher switching in Settings app.
 2014-08-07 12:01:05 +00:00
Sander Alewijnse
6173fed5a9 am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev 
* commit '6a39bc68aea91483804d2ab8635159803208095d':
  Prevent launcher switching in Settings app.
 2014-08-07 11:57:49 +00:00
Andres Morales
ff150032e3 Merge "Don't wipe PST partition if OEM unlock is enabled" into lmp-dev 2014-08-06 23:49:20 +00:00
Andres Morales
ae58323a6b Don't wipe PST partition if OEM unlock is enabled 
This will be wiped by the recovery system and the OEM
unlock bit will be retained.

Bug: 16631974
Change-Id: I65522dd93c8465ff7f7ecbcef404bff6e9c864d6
 2014-08-07 00:03:31 +00:00
Andres Morales
b1e7688aef Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev 2014-08-06 23:49:20 +00:00
Andres Morales
78ce5e8c9f Prevent newlines and long captions selecting default payment app 
This would allow attackers to spoof the default selection
dialog causing the user to unkowingly change their default
payment handler.

Bug: 15906632
Change-Id: I49ad2a7351bd6d2c1f9a79ad9be0cbc9787ca6c3
 2014-08-07 00:45:03 +00:00
Amith Yamasani
e36eaa3c8f am 494a1e3f: am 23f8ea97: am f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev 
* commit '494a1e3f7193718c1f12452ecf34f3ab3d2c8bdd':
  Fix removal of optional settings tiles
 2014-08-06 23:29:46 +00:00
Amith Yamasani
494a1e3f71 am 23f8ea97: am f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev 
* commit '23f8ea97ee444091103e177db09cd710dd27ee5a':
  Fix removal of optional settings tiles
 2014-08-06 23:25:53 +00:00
Amith Yamasani
23f8ea97ee am f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev 
* commit 'f34c3501948190acf44defefba8eb161ec6dc07b':
  Fix removal of optional settings tiles
 2014-08-06 23:21:29 +00:00
Geoff Mendal
d308d32c5e am 4975290b: (-s ours) am 8116ff65: (-s ours) am a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4975290b2b311721ddeb76ee6a3de492f51afaa1':
  Import translations. DO NOT MERGE
 2014-08-06 23:01:06 +00:00
Geoff Mendal
4975290b2b am 8116ff65: (-s ours) am a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '8116ff6506bf884d1c0c4bac6d4b4d59c35eb9e8':
  Import translations. DO NOT MERGE
 2014-08-06 19:55:43 +00:00
Fabrice Di Meglio
79e6107b4e am 00acf0a6: am 6d327ca8: am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 
* commit '00acf0a64a5d62269adc567f164cc26e5b640b3b':
  Fix bug #16800261 Settings app: Device administrator screen padding issue
 2014-08-06 19:54:56 +00:00
Geoff Mendal
8116ff6506 am a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a0b87a2436c95777dcb3b3a14660105aa63d0b80':
  Import translations. DO NOT MERGE
 2014-08-06 19:50:48 +00:00
Fabrice Di Meglio
00acf0a64a am 6d327ca8: am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 
* commit '6d327ca8d126e00bf8785b5752c4d75d09fa231c':
  Fix bug #16800261 Settings app: Device administrator screen padding issue
 2014-08-06 19:49:56 +00:00
Fabrice Di Meglio
6d327ca8d1 am fa8950be: Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 
* commit 'fa8950be33c777d0305775ee3a364300d454f91b':
  Fix bug #16800261 Settings app: Device administrator screen padding issue
 2014-08-06 19:07:31 +00:00
Dan Sandler
3d90389f4e am c242bf37: am bac0fc1f: Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev 
* commit 'c242bf375bcb63bf29f88bec6dc4167b2c43ec25':
  Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
 2014-08-06 18:09:17 +00:00
Dan Sandler
c242bf375b am bac0fc1f: Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-dev 
* commit 'bac0fc1f6b448c41f9f3889cba2b93c718dc1788':
  Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.
 2014-08-06 18:05:45 +00:00
Dan Sandler
43b0f512d1 am 0ed91709: am 4bdf8b49: Merge "Replace missing resource." into lmp-dev 
* commit '0ed917098e7295dcc6f346df7e5adc19ead3f7da':
  Replace missing resource.
 2014-08-06 18:05:05 +00:00
Fabrice Di Meglio
0ecc58ff9b am 911a54df: am bce84e79: Merge "Fix bug #16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev 
* commit '911a54df7de994a5a4b3c2593e268fcca772aa19':
  Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
 2014-08-06 18:05:04 +00:00
Dan Sandler
0ed917098e am 4bdf8b49: Merge "Replace missing resource." into lmp-dev 
* commit '4bdf8b498bf588f42368faf822f757fcd97a7959':
  Replace missing resource.
 2014-08-06 18:01:41 +00:00
Fabrice Di Meglio
911a54df7d am bce84e79: Merge "Fix bug #16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev 
* commit 'bce84e798bbfbb9fd576cb785d90bf69cb3843e0':
  Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
 2014-08-06 18:01:40 +00:00
Fabrice Di Meglio
fa8950be33 Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev 2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
06601e149e Fix bug #16800261 Settings app: Device administrator screen padding issue 
- remove listPreferredItemPaddingStart / listPreferredItemPaddingEnd from
the ListView and add it to the list item
- add missing 8dp end padding for the icon

Change-Id: I78696e5ee8e243771d23c86fa178de2f60b5c88d
 2014-08-06 11:25:39 -07:00
Fabrice Di Meglio
bce84e798b Merge "Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'" into lmp-dev 2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
df77106e94 Fix bug #16712121 Add 'Experimental' substring to 'High contrast text' 
- add "(Experimental)" as a summary text for "High contrast text"

Change-Id: I6faf1ea382e90a4f0dffcc8a093e4aa5a4653d23
 2014-08-06 10:55:39 -07:00
Alexandra Gherghina
1532a1828d am a456d886: am 1fcd7faa: Merge "Clears previously added cross-profile-intents" into lmp-dev 
* commit 'a456d886644052e9c32a826f32aaaa089e0104ee':
  Clears previously added cross-profile-intents
 2014-08-06 13:49:55 +00:00
Alexandra Gherghina
a456d88664 am 1fcd7faa: Merge "Clears previously added cross-profile-intents" into lmp-dev 
* commit '1fcd7faad666cfb56553c7313723a5c6fc8df3cb':
  Clears previously added cross-profile-intents
 2014-08-06 13:45:43 +00:00