PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,026 Commits 1 Branch 0 Tags
2c24d14d45166caed0720334192ee05a83e8229b
Commit Graph

15026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
2c24d14d45 am 331c2bf5: am 09076e5f: Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 
* commit '331c2bf5e6bfaa61136d8faa86acfab1b8802cd8':
  Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
 2014-08-08 19:51:11 +00:00
Fabrice Di Meglio
331c2bf5e6 am 09076e5f: Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 
* commit '09076e5f3c90dbc1a3bdf6f000e0c99dd2bb45b4':
  Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
 2014-08-08 19:39:57 +00:00
Jeff Sharkey
109ec50635 am c44e33e1: am dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev 
* commit 'c44e33e1a03a2b5e92db9329981885da35fe0ab8':
  Avoid NPE when template rapidly switched.
 2014-08-08 17:41:54 +00:00
Jeff Sharkey
c44e33e1a0 am dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev 
* commit 'dc16286ff32dfc4d087938461d0beca29b6167a3':
  Avoid NPE when template rapidly switched.
 2014-08-08 17:37:16 +00:00
PauloftheWest
f1103f73f4 am fc5a4085: am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev 
* commit 'fc5a4085e14957458677f10b1b69f15494df5794':
  Fixed Bluetooth renaming bug.
 2014-08-08 17:31:37 +00:00
Alexandra Gherghina
589766aa8c am eecdb636: am e54014c4: Merge "Open the same tab when switching profiles in apps settings" into lmp-dev 
* commit 'eecdb636b02d9c4c9280be9e6bf40849c2209ecd':
  Open the same tab when switching profiles in apps settings
 2014-08-08 17:31:31 +00:00
Fabrice Di Meglio
09076e5f3c Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 2014-08-08 17:26:08 +00:00
Fabrice Di Meglio
22a2a49b44 Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots 
- add the proper SearchIndexProvider to SimSettings
- allow indexing only an only if showSimCardTile() is true
- add Utils.showSimCardTile()

Change-Id: I5df2284d32f91fa454e1edebf1139d00593138a0
 2014-08-08 12:33:21 -07:00
PauloftheWest
fc5a4085e1 am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev 
* commit '14f60296574316f94ca03fb82fc3675db373734e':
  Fixed Bluetooth renaming bug.
 2014-08-08 17:24:12 +00:00
Alexandra Gherghina
eecdb636b0 am e54014c4: Merge "Open the same tab when switching profiles in apps settings" into lmp-dev 
* commit 'e54014c4bbabfa3307e51253308263da0844537b':
  Open the same tab when switching profiles in apps settings
 2014-08-08 17:24:11 +00:00
Dan Sandler
c6b71394ae am f27ee3c6: am b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev 
* commit 'f27ee3c6e2929f537575ff18cc5ceaf88ca2bbdb':
  Fully deprecate Power Control widget.
 2014-08-08 13:04:15 +00:00
Dan Sandler
f27ee3c6e2 am b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev 
* commit 'b5fca45768d36552ce74785dfbc9d7da7ce67bea':
  Fully deprecate Power Control widget.
 2014-08-08 12:59:34 +00:00
Jim Miller
87b7cc1a26 am 5ff26209: am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled." into lmp-dev 
* commit '5ff2620928084f1e206341bcf62d08b581c8cff5':
  Don't show TrustAgent entries when no security is enabled.
 2014-08-08 00:57:11 +00:00
PauloftheWest
8745327373 am e30ced00: am b0a97a52: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev 
* commit 'e30ced00160e66a51caa9605fd70e93400ffda0a':
  Removed infinite loop in Multi-Sim Settings.
 2014-08-08 00:56:36 +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
Jim Miller
5ff2620928 am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled." into lmp-dev 
* commit '6cd90f45b7fb7324eef9d05ae38e0e26bfc934d5':
  Don't show TrustAgent entries when no security is enabled.
 2014-08-07 22:29:33 +00:00
PauloftheWest
e30ced0016 am b0a97a52: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev 
* commit 'b0a97a52dffa5ea3520cb2ff58681c2782b53160':
  Removed infinite loop in Multi-Sim Settings.
 2014-08-07 22:00:50 +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
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
PauloftheWest
b0a97a52df Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev 2014-08-07 18:53:12 +00:00
PauloftheWest
97535e83a9 Removed infinite loop in Multi-Sim Settings. 
Change-Id: I1d5e78abcd9b93d8fb4e1b6c14d73f9d23dce38d
 2014-08-07 11:58:02 -07: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
Alexandra Gherghina
e54014c4bb Merge "Open the same tab when switching profiles in apps settings" into lmp-dev 2014-08-07 18:49:59 +00:00
Alexandra Gherghina
f276e75f2d Open the same tab when switching profiles in apps settings 
Bug: 16369104
Change-Id: Ibd23824a120541b17a5255952b7cf02d07b62c7b
 2014-08-08 11:45:31 +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
Jeff Sharkey
dc16286ff3 Merge "Avoid NPE when template rapidly switched." into lmp-dev 2014-08-07 18:39:40 +00:00
Jeff Sharkey
d0a5531576 Avoid NPE when template rapidly switched. 
Monkeys can race and end up swapping template before the dialog
is shown.

Bug: 16660160
Change-Id: I301784d707ee3998c38cf2874f7016a5c5350825
 2014-08-08 10:26:24 -07:00
Dan Sandler
b5fca45768 Merge "Fully deprecate Power Control widget." into lmp-dev 2014-08-07 18:39:40 +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
PauloftheWest
14f6029657 Merge "Fixed Bluetooth renaming bug." into lmp-dev 2014-08-07 17:50:16 +00:00
PauloftheWest
ed7b44d83d Fixed Bluetooth renaming bug. 
+ After renaming your Bluetooth device, the title of the Bluetooth
    Activity stays "Bluetooth" instead of changing to the new name.
+ After renaming the device, the status at the bottom Bluetooth Settings
    is correctly displayed.

Bug: 16463239
Change-Id: Ifb12df2004fe1f89bd6f918e23c2c64ae08a0191
 2014-08-08 09:34:15 -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
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
Dan Sandler
d12748d635 Fully deprecate Power Control widget. 
Its behavior is obviated by quick settings and battery
saver, and so should not be shipped on any new builds by
default.

Bug: 8415180
Change-Id: Ic941a1e536c0b37c6be62fed876bfa23e34dc84b
 2014-08-07 12:59:11 -04: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
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
Jim Miller
6cd90f45b7 Merge "Don't show TrustAgent entries when no security is enabled." into lmp-dev 2014-08-06 23:49:20 +00:00
Jim Miller
fe7655914d Don't show TrustAgent entries when no security is enabled. 
Fixes bug 16383666

Change-Id: Ia6c3d7563c384269d1e53ef5e2e07099432c8a13
 2014-08-07 15:16:51 -07: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