Alexandra Gherghina
4d6e46a399
am 589766aa
: am eecdb636
: am e54014c4
: Merge "Open the same tab when switching profiles in apps settings" into lmp-dev
...
* commit '589766aa8ca234867edd9ac2a914e793b330b013':
Open the same tab when switching profiles in apps settings
2014-08-08 17:39:17 +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
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
e7292d07b1
am c6b71394
: am f27ee3c6
: am b5fca457
: Merge "Fully deprecate Power Control widget." into lmp-dev
...
* commit 'c6b71394ae0380d97e1b312f34f4214e32a5a750':
Fully deprecate Power Control widget.
2014-08-08 13:07:09 +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
4e9aa5e905
am 87b7cc1a
: am 5ff26209
: am 6cd90f45
: Merge "Don\'t show TrustAgent entries when no security is enabled." into lmp-dev
...
* commit '87b7cc1a26b295b64955a0899a7088c981f17edb':
Don't show TrustAgent entries when no security is enabled.
2014-08-08 02:27:14 +00:00
PauloftheWest
55255645a9
am 87453273
: am e30ced00
: am b0a97a52
: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev
...
* commit '874532737336e9ff2a460424385a98cee4c9c127':
Removed infinite loop in Multi-Sim Settings.
2014-08-08 02:27:13 +00:00
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
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
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
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
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
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
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
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
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
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