OSDN Git Service
Michael Wright [Mon, 11 Aug 2014 20:58:24 +0000 (20:58 +0000)]
am
84086bef: am
ace6dc4f: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
* commit '
84086bef852e6c4009dbe71c10f38fa2d7c96262':
Show physical keyboard settings even when IME is enabled.
Michael Wright [Mon, 11 Aug 2014 20:53:15 +0000 (20:53 +0000)]
am
ace6dc4f: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
* commit '
ace6dc4f28bf3188c85d48ddebcd7c53d6d14079':
Show physical keyboard settings even when IME is enabled.
PauloftheWest [Mon, 11 Aug 2014 20:25:50 +0000 (20:25 +0000)]
am
c7396657: am
242b1e51: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
* commit '
c7396657e7765da5a448e32e0b9558d8078cad1a':
Removed the white icon from Bluetooth rename dialog.
PauloftheWest [Mon, 11 Aug 2014 20:20:04 +0000 (20:20 +0000)]
am
242b1e51: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
* commit '
242b1e51d45134f150487f60c3c00027737da05a':
Removed the white icon from Bluetooth rename dialog.
Michael Wright [Mon, 11 Aug 2014 20:47:19 +0000 (20:47 +0000)]
Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
Michael Wright [Sun, 10 Aug 2014 03:35:11 +0000 (20:35 -0700)]
Show physical keyboard settings even when IME is enabled.
The WindowManager lies about the configuration in order to get the
IME to show but the Settings page should still show the physical
keyboard options if one is connected though, so remove the
configuration check and just always check to see if there's a full
keyboard connected.
Bug:
14066881
Change-Id: I085fe4160f3524f3c95737a6809ee03fec5230b4
PauloftheWest [Mon, 11 Aug 2014 20:06:58 +0000 (20:06 +0000)]
Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
PauloftheWest [Mon, 11 Aug 2014 18:49:31 +0000 (11:49 -0700)]
Removed the white icon from Bluetooth rename dialog.
Bug:
15538917
Change-Id: I4e3bca9e8ff6c348af22cdfb17ee3b047ae12d2c
Jason Monk [Mon, 11 Aug 2014 17:19:49 +0000 (17:19 +0000)]
am
c2a716aa: am
918c23bd: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev
* commit '
c2a716aaca10ec3469573e13616dcccf70c1e088':
Don't allow creating guest when can't create user
Jason Monk [Mon, 11 Aug 2014 17:16:27 +0000 (17:16 +0000)]
am
918c23bd: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev
* commit '
918c23bd5ff6b8903634320723e57d8c0d79471f':
Don't allow creating guest when can't create user
Dianne Hackborn [Mon, 11 Aug 2014 17:16:01 +0000 (17:16 +0000)]
Dianne Hackborn [Mon, 11 Aug 2014 17:11:42 +0000 (17:11 +0000)]
am
f09fd458: Merge "Fix issues in Settings:
16660423,
13172381,
16868094" into lmp-dev
* commit '
f09fd458c4429f88f2d8678ffa147c0ca4cee064':
Fix issues in Settings:
16660423,
13172381,
16868094
Jason Monk [Mon, 11 Aug 2014 17:13:47 +0000 (17:13 +0000)]
Merge "Don't allow creating guest when can't create user" into lmp-dev
Dianne Hackborn [Mon, 11 Aug 2014 17:08:16 +0000 (17:08 +0000)]
Merge "Fix issues in Settings:
16660423,
13172381,
16868094" into lmp-dev
Jason Monk [Thu, 7 Aug 2014 20:02:03 +0000 (16:02 -0400)]
Don't allow creating guest when can't create user
When user restriction is on to disable adding user also stop the
user from creating guests.
Bug:
16782635
Change-Id: I0396172867e2e217ada9ef747ea62d0c0382c5dd
Zoltan Szatmary-Ban [Mon, 11 Aug 2014 12:16:53 +0000 (12:16 +0000)]
am
3acb8874: am
d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
* commit '
3acb88746af9fcf38d38d159b4d9556eee9b03bc':
Increase CHAR_LIMIT on Device Admins Settings message
Zoltan Szatmary-Ban [Mon, 11 Aug 2014 12:13:51 +0000 (12:13 +0000)]
am
d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
* commit '
d58f0bd64f1554a4c15b812bcd90fc52f00860b6':
Increase CHAR_LIMIT on Device Admins Settings message
Alexandra Gherghina [Mon, 11 Aug 2014 09:31:42 +0000 (09:31 +0000)]
am
bad9e585: am
ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev
* commit '
bad9e585dde30e6dcd1066bd5045516d79491b43':
Show managed profile under accounts rather than users
Alexandra Gherghina [Mon, 11 Aug 2014 09:29:20 +0000 (09:29 +0000)]
am
ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev
* commit '
ad54ba7030be6654bd76b3ee1a001d388130bcac':
Show managed profile under accounts rather than users
Alexandra Gherghina [Mon, 11 Aug 2014 09:02:08 +0000 (09:02 +0000)]
am
28034bad: am
59f01b9b: Merge "Fix updating view flow of Account Sync Settings" into lmp-dev
* commit '
28034badf70b5d8b46aeb19dbbb45465db7172b0':
Fix updating view flow of Account Sync Settings
Alexandra Gherghina [Mon, 11 Aug 2014 08:58:48 +0000 (08:58 +0000)]
am
59f01b9b: Merge "Fix updating view flow of Account Sync Settings" into lmp-dev
* commit '
59f01b9b585c374fadb935fb115b4ad34b100eb4':
Fix updating view flow of Account Sync Settings
Dianne Hackborn [Sun, 10 Aug 2014 23:32:08 +0000 (16:32 -0700)]
Fix issues in Settings:
16660423,
13172381,
16868094
Issue #
16660423: Stability: ArrayIndexOutOfBoundsException in settings:
at com.android.settings.fuelgauge.BatteryHistoryChart$ChartData.draw(
BatteryHistoryChart.java:109)
Issue #
13172381: No content description in Battery charging section
Issue #
16868094: Settings crash on switching to landscape mode with
"Google Text-to-speech" settings icon selected
Change-Id: I94d0e83f72d571eb90aad6742acabce56c0298ec
Barnaby James [Sat, 9 Aug 2014 20:02:13 +0000 (20:02 +0000)]
am
71d48c7d: am
092c62f1: Add voice-only settings activities for airplane mode.
* commit '
71d48c7deee389697247a96895afa2a833b3979e':
Add voice-only settings activities for airplane mode.
Barnaby James [Sat, 9 Aug 2014 19:57:54 +0000 (19:57 +0000)]
am
092c62f1: Add voice-only settings activities for airplane mode.
* commit '
092c62f1f3811f205c764fcb5b8347ec8fed67e6':
Add voice-only settings activities for airplane mode.
Barnaby James [Sat, 9 Aug 2014 04:01:01 +0000 (21:01 -0700)]
Add voice-only settings activities for airplane mode.
This activity can only be triggered through the Voice Interaction API - e.g. from calling VoiceInterationSession.startVoiceActivity()
Change-Id: I39ac409824693bc82e53d707a1ece2b23a89f3a3
Paul Lawrence [Fri, 8 Aug 2014 23:05:00 +0000 (23:05 +0000)]
am
c4427491: am
f8811a59: Merge "Strings for next change" into lmp-dev
* commit '
c44274917f0f320d9997e03aae0f1f6249572c2e':
Strings for next change
Paul Lawrence [Fri, 8 Aug 2014 22:59:36 +0000 (22:59 +0000)]
am
f8811a59: Merge "Strings for next change" into lmp-dev
* commit '
f8811a59ffd4fa39997154681d753d3370697b83':
Strings for next change
Adam Lesinski [Fri, 8 Aug 2014 22:44:23 +0000 (22:44 +0000)]
am
b6bf2d58: am
ff72b3ee: Merge "Update to use new UsageStats API" into lmp-dev
* commit '
b6bf2d584756468ffa666ee618702cb60c1263fe':
Update to use new UsageStats API
Adam Lesinski [Fri, 8 Aug 2014 22:39:52 +0000 (22:39 +0000)]
am
ff72b3ee: Merge "Update to use new UsageStats API" into lmp-dev
* commit '
ff72b3ee556e3524e0c5e3218e781a914aa1fa4e':
Update to use new UsageStats API
Fabrice Di Meglio [Fri, 8 Aug 2014 21:04:58 +0000 (21:04 +0000)]
am
212f1327: am
4fbe967e: Merge "Fix bug #
16578018 Wi-Fi network list items should be centered with icons" into lmp-dev
* commit '
212f13274bcce65a22f4c31b04fd5d72b56b3601':
Fix bug #
16578018 Wi-Fi network list items should be centered with icons
Fabrice Di Meglio [Fri, 8 Aug 2014 21:02:32 +0000 (21:02 +0000)]
am
4fbe967e: Merge "Fix bug #
16578018 Wi-Fi network list items should be centered with icons" into lmp-dev
* commit '
4fbe967e0f19e04e5ed40cc42c55ec0b5dfc5643':
Fix bug #
16578018 Wi-Fi network list items should be centered with icons
Zoltan Szatmary-Ban [Mon, 11 Aug 2014 12:10:46 +0000 (12:10 +0000)]
Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
Zoltan Szatmary-Ban [Mon, 11 Aug 2014 10:50:39 +0000 (11:50 +0100)]
Increase CHAR_LIMIT on Device Admins Settings message
Increased CHAR_LIMIT to 120 on @string/managed_profile_device_admin_info to
accomodate translation.
Bug:
16838113
Change-Id: I111ed73d6ff546387c4a2b5df5f4edf8a3932be7
Alexandra Gherghina [Mon, 11 Aug 2014 09:26:51 +0000 (09:26 +0000)]
Merge "Show managed profile under accounts rather than users" into lmp-dev
Alexandra Gherghina [Thu, 31 Jul 2014 18:30:41 +0000 (19:30 +0100)]
Show managed profile under accounts rather than users
Also fixes overflow menu to update on remove/add managed profile.
Bug:
16234745
Bug:
16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
Fabrice Di Meglio [Fri, 8 Aug 2014 20:58:37 +0000 (20:58 +0000)]
Merge "Fix bug #
16578018 Wi-Fi network list items should be centered with icons" into lmp-dev
Fabrice Di Meglio [Fri, 8 Aug 2014 20:55:58 +0000 (13:55 -0700)]
Fix bug #
16578018 Wi-Fi network list items should be centered with icons
- force correct refresh of the Preference summary
- put some non used code into comment ...
Change-Id: I17fc6fe2cf0717bae613d78cfac2c88d3e160ef4
Fabrice Di Meglio [Fri, 8 Aug 2014 20:04:41 +0000 (20:04 +0000)]
am
7aa645e4: am
07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev
* commit '
7aa645e4986468dbc0c8bfa9edea174e82ef97ab':
Fix Wi-Fi Assistant padding
Fabrice Di Meglio [Fri, 8 Aug 2014 20:02:19 +0000 (20:02 +0000)]
am
07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev
* commit '
07fd346996c61c47e1dc13648cbbde3090a4b248':
Fix Wi-Fi Assistant padding
Fabrice Di Meglio [Fri, 8 Aug 2014 19:51:11 +0000 (19:51 +0000)]
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
Fabrice Di Meglio [Fri, 8 Aug 2014 19:39:57 +0000 (19:39 +0000)]
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
Alexandra Gherghina [Mon, 11 Aug 2014 08:54:29 +0000 (08:54 +0000)]
Merge "Fix updating view flow of Account Sync Settings" into lmp-dev
Adam Lesinski [Fri, 8 Aug 2014 22:36:33 +0000 (22:36 +0000)]
Merge "Update to use new UsageStats API" into lmp-dev
Jeff Sharkey [Fri, 8 Aug 2014 17:41:54 +0000 (17:41 +0000)]
am
c44e33e1: am
dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev
* commit '
c44e33e1a03a2b5e92db9329981885da35fe0ab8':
Avoid NPE when template rapidly switched.
Jeff Sharkey [Fri, 8 Aug 2014 17:37:16 +0000 (17:37 +0000)]
am
dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev
* commit '
dc16286ff32dfc4d087938461d0beca29b6167a3':
Avoid NPE when template rapidly switched.
PauloftheWest [Fri, 8 Aug 2014 17:31:37 +0000 (17:31 +0000)]
am
fc5a4085: am
14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev
* commit '
fc5a4085e14957458677f10b1b69f15494df5794':
Fixed Bluetooth renaming bug.
Alexandra Gherghina [Fri, 8 Aug 2014 17:31:31 +0000 (17:31 +0000)]
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
Fabrice Di Meglio [Fri, 8 Aug 2014 19:35:06 +0000 (19:35 +0000)]
Merge "Fix bug #
16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev
Fabrice Di Meglio [Fri, 8 Aug 2014 19:27:57 +0000 (12:27 -0700)]
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
PauloftheWest [Fri, 8 Aug 2014 17:24:12 +0000 (17:24 +0000)]
am
14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev
* commit '
14f60296574316f94ca03fb82fc3675db373734e':
Fixed Bluetooth renaming bug.
Alexandra Gherghina [Fri, 8 Aug 2014 17:24:11 +0000 (17:24 +0000)]
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
Alexandra Gherghina [Fri, 8 Aug 2014 17:14:32 +0000 (18:14 +0100)]
Fix updating view flow of Account Sync Settings
Bug:
16785070 Account sync settings page doesn't refresh after removing account
Change-Id: Iddbe9d73f4d6fcb55829f8bb6ab2fe6ffa147cf3
Dan Sandler [Fri, 8 Aug 2014 13:04:15 +0000 (13:04 +0000)]
am
f27ee3c6: am
b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev
* commit '
f27ee3c6e2929f537575ff18cc5ceaf88ca2bbdb':
Fully deprecate Power Control widget.
Dan Sandler [Fri, 8 Aug 2014 12:59:34 +0000 (12:59 +0000)]
am
b5fca457: Merge "Fully deprecate Power Control widget." into lmp-dev
* commit '
b5fca45768d36552ce74785dfbc9d7da7ce67bea':
Fully deprecate Power Control widget.
Adam Lesinski [Thu, 7 Aug 2014 00:53:38 +0000 (17:53 -0700)]
Update to use new UsageStats API
Change-Id: Ic6f9523c4c70f8b832d8f57551417f4f19ea144f
Jim Miller [Fri, 8 Aug 2014 00:57:11 +0000 (00:57 +0000)]
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.
PauloftheWest [Fri, 8 Aug 2014 00:56:36 +0000 (00:56 +0000)]
am
e30ced00: am
b0a97a52: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev
* commit '
e30ced00160e66a51caa9605fd70e93400ffda0a':
Removed infinite loop in Multi-Sim Settings.
Kenny Guy [Fri, 8 Aug 2014 00:55:44 +0000 (00:55 +0000)]
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.
Dianne Hackborn [Fri, 8 Aug 2014 00:55:33 +0000 (00:55 +0000)]
am
02f8ee9a: am
537a0a82: Fix issue #
16555033: Battery history overflowing too much
* commit '
02f8ee9a056a9f9144c3a150c1e65ba6be478b8a':
Fix issue #
16555033: Battery history overflowing too much
PauloftheWest [Fri, 8 Aug 2014 00:53:31 +0000 (00:53 +0000)]
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.
Jim Miller [Thu, 7 Aug 2014 22:29:33 +0000 (22:29 +0000)]
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.
PauloftheWest [Thu, 7 Aug 2014 22:00:50 +0000 (22:00 +0000)]
am
b0a97a52: Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev
* commit '
b0a97a52dffa5ea3520cb2ff58681c2782b53160':
Removed infinite loop in Multi-Sim Settings.
Kenny Guy [Thu, 7 Aug 2014 21:08:24 +0000 (21:08 +0000)]
am
39a37163: Merge "Move over to CharSequence version of badging method." into lmp-dev
* commit '
39a371631370cd6f150d2d67d73e2d96da7a5e18':
Move over to CharSequence version of badging method.
Dianne Hackborn [Thu, 7 Aug 2014 21:04:22 +0000 (21:04 +0000)]
am
537a0a82: Fix issue #
16555033: Battery history overflowing too much
* commit '
537a0a82351d9671d14dccde8c9fc2a45c3c4f3a':
Fix issue #
16555033: Battery history overflowing too much
Dianne Hackborn [Thu, 7 Aug 2014 02:22:46 +0000 (19:22 -0700)]
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
Andres Morales [Thu, 7 Aug 2014 19:07:03 +0000 (19:07 +0000)]
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
PauloftheWest [Thu, 7 Aug 2014 21:53:44 +0000 (21:53 +0000)]
Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev
PauloftheWest [Thu, 7 Aug 2014 17:41:41 +0000 (10:41 -0700)]
Removed infinite loop in Multi-Sim Settings.
Change-Id: I1d5e78abcd9b93d8fb4e1b6c14d73f9d23dce38d
Kenny Guy [Thu, 7 Aug 2014 21:05:48 +0000 (21:05 +0000)]
Merge "Move over to CharSequence version of badging method." into lmp-dev
Kenny Guy [Thu, 7 Aug 2014 21:01:22 +0000 (22:01 +0100)]
Move over to CharSequence version of badging method.
Bug:
16484455
Change-Id: Ie5ee010efc439219cb71fd4241fdb798a5f4ea12
Paul Lawrence [Fri, 8 Aug 2014 22:56:41 +0000 (22:56 +0000)]
Merge "Strings for next change" into lmp-dev
Paul Lawrence [Fri, 8 Aug 2014 21:27:23 +0000 (14:27 -0700)]
Strings for next change
Next change is titled
Bring up factory reset UI when decryption fails but password is correct
Strings need to go in today to catch translation for L
Bug:
11477689
Change-Id: I84ddc2f88917ba9749fe4dc58fb00d4020cfe685
Fabrice Di Meglio [Fri, 8 Aug 2014 19:58:41 +0000 (19:58 +0000)]
Merge "Fix Wi-Fi Assistant padding" into lmp-dev
Fabrice Di Meglio [Fri, 8 Aug 2014 19:56:51 +0000 (12:56 -0700)]
Fix Wi-Fi Assistant padding
- use the standard list padding instead of a custom one
See bug: #
15703202 Wi-Fi Assistant card needs to appear in Wi-Fi network list
Change-Id: I5816751bf7937807093e5b74b25b84151431fa7b
Alexandra Gherghina [Fri, 8 Aug 2014 17:17:56 +0000 (17:17 +0000)]
Merge "Open the same tab when switching profiles in apps settings" into lmp-dev
Alexandra Gherghina [Thu, 31 Jul 2014 11:46:15 +0000 (12:46 +0100)]
Open the same tab when switching profiles in apps settings
Bug:
16369104
Change-Id: Ibd23824a120541b17a5255952b7cf02d07b62c7b
PauloftheWest [Thu, 7 Aug 2014 18:40:34 +0000 (18:40 +0000)]
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.
Jeff Sharkey [Fri, 8 Aug 2014 17:32:39 +0000 (17:32 +0000)]
Merge "Avoid NPE when template rapidly switched." into lmp-dev
Jeff Sharkey [Fri, 8 Aug 2014 17:25:24 +0000 (10:25 -0700)]
Avoid NPE when template rapidly switched.
Monkeys can race and end up swapping template before the dialog
is shown.
Bug:
16660160
Change-Id: I301784d707ee3998c38cf2874f7016a5c5350825
Dan Sandler [Fri, 8 Aug 2014 12:57:33 +0000 (12:57 +0000)]
Merge "Fully deprecate Power Control widget." into lmp-dev
PauloftheWest [Sun, 3 Aug 2014 22:17:45 +0000 (15:17 -0700)]
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
PauloftheWest [Fri, 8 Aug 2014 17:18:56 +0000 (17:18 +0000)]
Merge "Fixed Bluetooth renaming bug." into lmp-dev
PauloftheWest [Fri, 8 Aug 2014 15:36:26 +0000 (08:36 -0700)]
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
Andres Morales [Thu, 7 Aug 2014 17:36:51 +0000 (17:36 +0000)]
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
Andres Morales [Thu, 7 Aug 2014 17:18:51 +0000 (17:18 +0000)]
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
Andres Morales [Thu, 7 Aug 2014 17:13:23 +0000 (17:13 +0000)]
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
Dan Sandler [Thu, 7 Aug 2014 16:59:11 +0000 (12:59 -0400)]
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
Zoltan Szatmary-Ban [Thu, 7 Aug 2014 13:45:44 +0000 (13:45 +0000)]
am
50946be4: am
ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev
* commit '
50946be41612f713f29041c39a1c324219c95b98':
Badge texts correctly for accessibility in Settings
Zoltan Szatmary-Ban [Thu, 7 Aug 2014 13:41:42 +0000 (13:41 +0000)]
am
ec08228e: Merge "Badge texts correctly for accessibility in Settings" into lmp-dev
* commit '
ec08228ea9a3713fbfac05fe211fc931992788a2':
Badge texts correctly for accessibility in Settings
Sander Alewijnse [Thu, 7 Aug 2014 12:01:05 +0000 (12:01 +0000)]
am
6173fed5: am
6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev
* commit '
6173fed5a9afa1c410067e4840a3371b1c08490a':
Prevent launcher switching in Settings app.
Sander Alewijnse [Thu, 7 Aug 2014 11:57:49 +0000 (11:57 +0000)]
am
6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev
* commit '
6a39bc68aea91483804d2ab8635159803208095d':
Prevent launcher switching in Settings app.
Jim Miller [Thu, 7 Aug 2014 22:25:46 +0000 (22:25 +0000)]
Merge "Don't show TrustAgent entries when no security is enabled." into lmp-dev
Jim Miller [Thu, 31 Jul 2014 22:30:29 +0000 (15:30 -0700)]
Don't show TrustAgent entries when no security is enabled.
Fixes bug
16383666
Change-Id: Ia6c3d7563c384269d1e53ef5e2e07099432c8a13
Andres Morales [Thu, 7 Aug 2014 17:33:58 +0000 (17:33 +0000)]
Merge "Don't wipe PST partition if OEM unlock is enabled" into lmp-dev
Andres Morales [Thu, 7 Aug 2014 00:01:19 +0000 (17:01 -0700)]
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
Andres Morales [Thu, 7 Aug 2014 17:05:48 +0000 (17:05 +0000)]
Merge "Prevent newlines and long captions selecting default payment app" into lmp-dev
Andres Morales [Tue, 22 Jul 2014 18:04:21 +0000 (11:04 -0700)]
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
Amith Yamasani [Wed, 6 Aug 2014 23:25:53 +0000 (23:25 +0000)]
am
23f8ea97: am
f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev
* commit '
23f8ea97ee444091103e177db09cd710dd27ee5a':
Fix removal of optional settings tiles
Amith Yamasani [Wed, 6 Aug 2014 23:21:29 +0000 (23:21 +0000)]
am
f34c3501: Merge "Fix removal of optional settings tiles" into lmp-dev
* commit '
f34c3501948190acf44defefba8eb161ec6dc07b':
Fix removal of optional settings tiles
Geoff Mendal [Wed, 6 Aug 2014 19:55:43 +0000 (19:55 +0000)]
am
8116ff65: (-s ours) am
a0b87a24: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
8116ff6506bf884d1c0c4bac6d4b4d59c35eb9e8':
Import translations. DO NOT MERGE
OSDN Git Service
