git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

John Spurlock [Wed, 17 Sep 2014 19:53:54 +0000 (19:53 +0000)]

am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit '9e51261dcc5db11be92660a3bde6b1f1e59ee128':
Settings: Ensure CryptKeeper dismisses secure keyguards.

commit | commitdiff | tree

John Spurlock [Wed, 17 Sep 2014 19:48:11 +0000 (19:48 +0000)]

am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit 'ae9d437b4ab8dc98c347e4218390a38900979faa':
Settings: Ensure CryptKeeper dismisses secure keyguards.

commit | commitdiff | tree

John Spurlock [Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)]

Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Wed, 17 Sep 2014 18:49:59 +0000 (18:49 +0000)]

am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation.

* commit '63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
Increase char limit for translation.

commit | commitdiff | tree

PauloftheWest [Wed, 17 Sep 2014 18:41:09 +0000 (18:41 +0000)]

am 08183704: am 3cc81aea: Increase char limit for translation.

* commit '0818370405da62d427620da5407ca4c5f9c969a0':
Increase char limit for translation.

commit | commitdiff | tree

PauloftheWest [Wed, 17 Sep 2014 18:30:12 +0000 (18:30 +0000)]

am 3cc81aea: Increase char limit for translation.

* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb':
Increase char limit for translation.

commit | commitdiff | tree

John Spurlock [Wed, 17 Sep 2014 16:55:17 +0000 (12:55 -0400)]

Settings: Ensure CryptKeeper dismisses secure keyguards.

Otherwise, the lockscreen can be shown during the decryption
challenge, which hides the challenge activity window until
the next reboot.

Bug:17512377
Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af

commit | commitdiff | tree

PauloftheWest [Wed, 17 Sep 2014 15:30:09 +0000 (08:30 -0700)]

Increase char limit for translation.

Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5

commit | commitdiff | tree

Amith Yamasani [Tue, 16 Sep 2014 23:36:40 +0000 (16:36 -0700)]

Don't allow creating a guest from a secondary user...

unless the primary user has allowed Guest and user creation from
lockscreen.

Bug: 17482220
Change-Id: Idd05889da330d6cbe0d3ccab2e98abfdeba94b96

commit | commitdiff | tree

Maurice Lam [Tue, 16 Sep 2014 19:44:14 +0000 (19:44 +0000)]

am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev

* commit '2ffb10d28bd1945004bd29390803a81ce5bf3338':
[WifiSetup] Update connection state for auto-finish

commit | commitdiff | tree

Maurice Lam [Tue, 16 Sep 2014 19:36:47 +0000 (19:36 +0000)]

am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev

* commit 'fd4e0f2567c97c71615d8defc3b12ed51ce77c05':
[WifiSetup] Update connection state for auto-finish

commit | commitdiff | tree

Maurice Lam [Tue, 16 Sep 2014 18:47:07 +0000 (18:47 +0000)]

am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev

* commit '27d74fa288c195aa5e1190da5599965472f1aded':
[WifiSetup] Update connection state for auto-finish

commit | commitdiff | tree

Maurice Lam [Tue, 16 Sep 2014 18:35:38 +0000 (18:35 +0000)]

Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 18:22:37 +0000 (18:22 +0000)]

am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'fbb0218a117df5537f6ef2835a673ef485e1cdb1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Maurice Lam [Tue, 16 Sep 2014 03:40:26 +0000 (20:40 -0700)]

[WifiSetup] Update connection state for auto-finish

In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.

Bug: 17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 18:03:21 +0000 (18:03 +0000)]

am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '1741abb95c2a30cd10ba829aca345b3d919f3ef6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 15:26:42 +0000 (15:26 +0000)]

am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '09a11d5bf4c42a7cd2eac4469933109a29f5bb68':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 16 Sep 2014 15:21:04 +0000 (15:21 +0000)]

am 88ff5747: am a2bba88b: am b88d24df: am f8310c18: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev

* commit '88ff5747b67df59fd623b177a06bce86b5031fb8':

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 15:21:03 +0000 (15:21 +0000)]

am 08455c57: am c1806600: am 23d0ac44: am b2197d90: Added bluetooth_device_settings_header to fix build breakage.

* commit '08455c5791f706f8d55cd08a96375a209597d5d5':

commit | commitdiff | tree

Jim Miller [Tue, 16 Sep 2014 15:21:02 +0000 (15:21 +0000)]

am 0787af48: am 825eb63c: am f496ae94: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev

* commit '0787af48c7efa96ba3fa5a44b8686428e9f020a6':

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 15:21:01 +0000 (15:21 +0000)]

am c742cfc7: (-s ours) am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'c742cfc716bba4ee2bd6dbe62a42d182baa4b6bd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 15:21:00 +0000 (15:21 +0000)]

am 52e19465: am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev

* commit '52e1946554a45b6034bcf23ed46f3033fe843129':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 15:20:59 +0000 (15:20 +0000)]

am 315e0a4a: am 31915522: Settings: Remove fixed dropdown width from "From" pref.

* commit '315e0a4a9e0a87972f7e5e8e850a226bdf90d83a':

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 15:20:58 +0000 (15:20 +0000)]

am 4708092e: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev

* commit '4708092e4f1b9538ddd8e3fc797ad184eea78233':

commit | commitdiff | tree

Jason Monk [Tue, 16 Sep 2014 15:20:57 +0000 (15:20 +0000)]

am c80014fb: am 062f736c: Adding zen mode condition dialog

* commit 'c80014fbbbfbefaab96aeffd9dd585801bd8d0e9':

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 16 Sep 2014 15:20:56 +0000 (15:20 +0000)]

am 743400b4: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev

* commit '743400b466ad6459fe01a35596bf7478695cee57':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 15:20:55 +0000 (15:20 +0000)]

am 417b8261: am 1e7dbd45: Settings: Use the same day sequence for downtime.

* commit '417b826176e1b88ef640518eaed639726a84e9ec':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 15:20:54 +0000 (15:20 +0000)]

am 0ed4f5b7: am cddb2954: Settings: Make downtime days scrollable.

* commit '0ed4f5b7b122f98a37c0cd1de0de9ccc55795a14':

commit | commitdiff | tree

Matthew Xie [Tue, 16 Sep 2014 15:20:52 +0000 (15:20 +0000)]

am a5d4c1b2: am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev

* commit 'a5d4c1b2be158f08c0363dc7339d01b5845fd5bc':

commit | commitdiff | tree

Carlos Valdivia [Tue, 16 Sep 2014 15:20:51 +0000 (15:20 +0000)]

am cece1cb2: am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev

* commit 'cece1cb20899394cd1710f5d02aa7fdacedaf653':

commit | commitdiff | tree

Elliott Hughes [Tue, 16 Sep 2014 15:20:50 +0000 (15:20 +0000)]

am 6312a721: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev

* commit '6312a72136458287c467a224bb6e19ac9eedb203':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 15:20:48 +0000 (15:20 +0000)]

am 723abba6: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev

* commit '723abba6c5315390cfdada773987d9522b7b1038':

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 15:16:36 +0000 (15:16 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 09:07:08 +0000 (09:07 +0000)]

am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev

* commit 'd1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
Alignment updates for Wi-Fi Settings dialog.

commit | commitdiff | tree

Edward Jee [Tue, 16 Sep 2014 09:07:07 +0000 (09:07 +0000)]

am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.

* commit '000dd0a6b24a8c383a2051201699bd2c93bc4159':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.

commit | commitdiff | tree

Edward Jee [Tue, 16 Sep 2014 09:07:06 +0000 (09:07 +0000)]

am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev

* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
Do not show phonebook access permission dialog if pairing dialog has already been shown.

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 09:07:05 +0000 (09:07 +0000)]

am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev

* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
Removed all references to "Google Wi-Fi Assistant" from Settings.

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 09:07:04 +0000 (09:07 +0000)]

am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.

* commit '2acec6768fc67516eff484f6d4f8de607a597a60':
Little more on issue #17495264: tweak when we ignore initial times.

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 09:07:03 +0000 (09:07 +0000)]

am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev

* commit 'ff966f2a82044bed1d9d791be9aa0c30c8bb26cc':
Fix issue #17495264: Battery history graph is bad

commit | commitdiff | tree

Maurice Lam [Tue, 16 Sep 2014 09:07:02 +0000 (09:07 +0000)]

am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window

* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
[WifiSetup] Disable app starting window

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 08:52:57 +0000 (08:52 +0000)]

am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev

* commit '9007cf6369eee6179082de8c769da6cad4906831':
Alignment updates for Wi-Fi Settings dialog.

commit | commitdiff | tree

Edward Jee [Tue, 16 Sep 2014 08:52:57 +0000 (08:52 +0000)]

am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.

* commit 'a99ef8871e204a04bc2b6436eede2078f8001b98':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.

commit | commitdiff | tree

Edward Jee [Tue, 16 Sep 2014 08:52:55 +0000 (08:52 +0000)]

am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev

* commit '50b6eec908fa76dfe426016d621cda3b013846b1':
Do not show phonebook access permission dialog if pairing dialog has already been shown.

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 08:52:54 +0000 (08:52 +0000)]

am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev

* commit '720af58039c31bbf9f239600a898202b971987f5':
Removed all references to "Google Wi-Fi Assistant" from Settings.

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 08:52:53 +0000 (08:52 +0000)]

am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.

* commit 'bf4ecab3ebf691dec8c2734f3dce9a547ea32ad5':
Little more on issue #17495264: tweak when we ignore initial times.

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 08:52:52 +0000 (08:52 +0000)]

am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev

* commit '829b9975b682fcc2c2404fa1ec7397ee5d4cfcae':
Fix issue #17495264: Battery history graph is bad

commit | commitdiff | tree

Maurice Lam [Tue, 16 Sep 2014 08:52:51 +0000 (08:52 +0000)]

am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window

* commit '0d09c6c190436ffc28dd9c04af1a1e7aa203463c':
[WifiSetup] Disable app starting window

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 08:32:12 +0000 (08:32 +0000)]

am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev

* commit 'ec21e62a78d98dfb22faeb8bd27ac07061ae83a3':
Alignment updates for Wi-Fi Settings dialog.

commit | commitdiff | tree

Edward Jee [Tue, 16 Sep 2014 08:32:11 +0000 (08:32 +0000)]

am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.

* commit 'ac8b5b7fd6b6774d22d39bb9a4becca1908915c7':
Migrates PBAP and MAP access permission data from Settings to Bluetooth.

commit | commitdiff | tree

Edward Jee [Tue, 16 Sep 2014 08:32:10 +0000 (08:32 +0000)]

am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev

* commit 'b0954c1d1e02958fd357cae11613f4539fbe270a':
Do not show phonebook access permission dialog if pairing dialog has already been shown.

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 08:32:09 +0000 (08:32 +0000)]

am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev

* commit '0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90':
Removed all references to "Google Wi-Fi Assistant" from Settings.

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 08:32:08 +0000 (08:32 +0000)]

am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.

* commit '94aae9afd18c17848aed68addd19d93c937c7555':
Little more on issue #17495264: tweak when we ignore initial times.

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 08:32:07 +0000 (08:32 +0000)]

am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev

* commit 'ecffbc91b15ec558be27fd171a64ad5db9e2b7d1':
Fix issue #17495264: Battery history graph is bad

commit | commitdiff | tree

Maurice Lam [Tue, 16 Sep 2014 08:32:06 +0000 (08:32 +0000)]

am 795511ec: [WifiSetup] Disable app starting window

* commit '795511ec9c952041afb158d43dd22960443b503f':
[WifiSetup] Disable app starting window

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 08:30:51 +0000 (08:30 +0000)]

am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev

* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
Updated Wi-Fi Settings icons to new filled-in teal format.

commit | commitdiff | tree

PauloftheWest [Tue, 16 Sep 2014 02:13:29 +0000 (02:13 +0000)]

Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev

commit | commitdiff | tree

Edward Jee [Mon, 8 Sep 2014 23:45:29 +0000 (16:45 -0700)]

Migrates PBAP and MAP access permission data from Settings to Bluetooth.

Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.

However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.

Bug: 17158953
Change-Id: I44fde350ea35027df0de77feec1ea19c65f2f1c6

commit | commitdiff | tree

Edward Jee [Tue, 16 Sep 2014 01:19:07 +0000 (01:19 +0000)]

Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:56:07 +0000 (23:56 +0000)]

am 56b3f338: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev

* commit '56b3f338e7bc85d30f56eafce4d6d0dc2dd46e3b':

commit | commitdiff | tree

Amith Yamasani [Mon, 15 Sep 2014 23:56:06 +0000 (23:56 +0000)]

am b8931381: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev

* commit 'b89313812dbefe68ac48b06e3ca9c603c42cae1c':

commit | commitdiff | tree

Adam Lesinski [Mon, 15 Sep 2014 23:56:05 +0000 (23:56 +0000)]

am 98739309: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev

* commit '98739309e15e1437f15d92872712fe05ba29a4dc':

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:56:04 +0000 (23:56 +0000)]

am 4cf6dcf6: am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev

* commit '4cf6dcf6aff003cc4d294275209cb3987c07775f':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 15 Sep 2014 23:56:03 +0000 (23:56 +0000)]

am dbcfc1b7: am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev

* commit 'dbcfc1b73678e53bf89d11c5c4fe47a74f4508a7':

commit | commitdiff | tree

Elliott Hughes [Mon, 15 Sep 2014 23:56:00 +0000 (23:56 +0000)]

am bce031b0: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev

* commit 'bce031b0ad16c0ba127627ca7231d872d23ce9c3':

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:55:59 +0000 (23:55 +0000)]

am 5dcec205: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev

* commit '5dcec20557353a79aaa97e113583507b4f1a7433':

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:55:58 +0000 (23:55 +0000)]

am 91f76560: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev

* commit '91f76560f80f006ce704f80f21400d91ffe43e89':

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:55:57 +0000 (23:55 +0000)]

am 9128659b: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev

* commit '9128659be872890927291c30df781d3522d34a1e':

commit | commitdiff | tree

Andres Morales [Mon, 15 Sep 2014 23:55:51 +0000 (23:55 +0000)]

am a40a9a90: am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev

* commit 'a40a9a90b33fc3c51f08b03503354ab0e90ac0c2':

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:55:50 +0000 (23:55 +0000)]

am 5c86c955: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev

* commit '5c86c9551388e85b172a8305a0e9dd79ef025785':

commit | commitdiff | tree

Alan Viverette [Mon, 15 Sep 2014 23:55:49 +0000 (23:55 +0000)]

am ce7c0337: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev

* commit 'ce7c0337202bbf063a50e6436c246b35949ae0c3':

commit | commitdiff | tree

vandwalle [Mon, 15 Sep 2014 23:55:48 +0000 (23:55 +0000)]

am 4d5ddf0c: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev

* commit '4d5ddf0cce5cd5cafb5b23e3289a279c7540abca':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 15 Sep 2014 23:55:47 +0000 (23:55 +0000)]

am c210a3f2: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev

* commit 'c210a3f2c645ead7dee4c76662dc0da14ffb0bc1':

commit | commitdiff | tree

Carlos Valdivia [Mon, 15 Sep 2014 23:55:46 +0000 (23:55 +0000)]

am b38b1b9e: am 690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev

* commit 'b38b1b9ed63ed11ad845551300b0e48720dec843':

commit | commitdiff | tree

Jim Miller [Mon, 15 Sep 2014 23:55:45 +0000 (23:55 +0000)]

am 75c782bf: am 1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev

* commit '75c782bf71057138375e5e11d815cde5c301e4de':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 15 Sep 2014 23:55:44 +0000 (23:55 +0000)]

am ba89f50a: am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev

* commit 'ba89f50ae7bf52ac7307723257cea8a3114b1a51':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 15 Sep 2014 23:55:43 +0000 (23:55 +0000)]

am 70ad4ffd: am dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev

* commit '70ad4ffd056c93338eb0e292fb6e675b40cb7434':

commit | commitdiff | tree

Amith Yamasani [Mon, 15 Sep 2014 23:55:42 +0000 (23:55 +0000)]

am 45308ef2: am 30c50b15: Use correct API for badging

* commit '45308ef25d6b10f0a96bb32bfca1bdc6bb63725d':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:41 +0000 (23:55 +0000)]

am 17f556c7: am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev

* commit '17f556c7081e911268d5f9ed6bdc349b6ace6c65':

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:55:40 +0000 (23:55 +0000)]

am 5437b488: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev

* commit '5437b488cb39538c2685013c0afc5ef798d3847e':

commit | commitdiff | tree

Barnaby James [Mon, 15 Sep 2014 23:55:39 +0000 (23:55 +0000)]

am 1299446d: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev

* commit '1299446dee8d928ade9d3b7f2e433dbcf153551e':

commit | commitdiff | tree

Amith Yamasani [Mon, 15 Sep 2014 23:55:38 +0000 (23:55 +0000)]

am ba790ca3: am 91648629: Merge "Follow API change for method name" into lmp-dev

* commit 'ba790ca3aceb0be89e5b0142e6a871cf2b7e03a0':

commit | commitdiff | tree

Svetoslav [Mon, 15 Sep 2014 23:55:37 +0000 (23:55 +0000)]

am 9b8912db: am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev

* commit '9b8912dbee4b0acd6e7cfd8920e018695074a39e':

commit | commitdiff | tree

Svetoslav [Mon, 15 Sep 2014 23:55:36 +0000 (23:55 +0000)]

am 3c0385e4: am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev

* commit '3c0385e46506ecbd8694f10bc041c53695a9e8bb':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 23:55:35 +0000 (23:55 +0000)]

am 60b7e882: am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev

* commit '60b7e88289651ce846e179f663964602f469f4b6':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 15 Sep 2014 23:55:34 +0000 (23:55 +0000)]

am da1e8c75: am 51712241: Fix typo in intent filter

* commit 'da1e8c75fb15821e073e6da09e7b897616232b0d':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 15 Sep 2014 23:55:32 +0000 (23:55 +0000)]

am 8378516b: am 9b6ab158: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev

* commit '8378516b0bb4deefb68f30693f5bac2a3e1508ab':

commit | commitdiff | tree

Dan Sandler [Mon, 15 Sep 2014 23:55:32 +0000 (23:55 +0000)]

am 6f0507ad: am 8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.

* commit '6f0507add78fe79212b8408651be74e59f7c9dfa':

commit | commitdiff | tree

Wink Saville [Mon, 15 Sep 2014 23:55:31 +0000 (23:55 +0000)]

am 0e559d53: am aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev

* commit '0e559d532c7cce810caa06ec6b69638e608b5998':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:30 +0000 (23:55 +0000)]

am a1c6288b: am 0535ed55: Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev

* commit 'a1c6288b137e4babbf1da3bc3a573a106e7a939d':

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:55:29 +0000 (23:55 +0000)]

am 4cebc121: am 4a1b7b5f: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev

* commit '4cebc121506129eda1a6222bc19469956256643d':

commit | commitdiff | tree

Chris Wren [Mon, 15 Sep 2014 23:55:28 +0000 (23:55 +0000)]

am 2ed0ea21: am 0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev

* commit '2ed0ea2120d8356126f614655701382d1bf2a0fb':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:27 +0000 (23:55 +0000)]

am f475cfa3: am ed1175cf: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev

* commit 'f475cfa354f478dd8ad5779ce9e04c551e4bc3ed':

commit | commitdiff | tree

Andres Morales [Mon, 15 Sep 2014 23:55:26 +0000 (23:55 +0000)]

am db9745e4: am 5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev

* commit 'db9745e43a416afb6a52ff89013c2353c812faee':

commit | commitdiff | tree

Andres Morales [Mon, 15 Sep 2014 23:55:25 +0000 (23:55 +0000)]

am d5723235: am 1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev

* commit 'd572323580c0eabb59e9d63f4f3c58f1aa32c71b':

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Sep 2014 23:55:24 +0000 (23:55 +0000)]

am 19843ad1: (-s ours) am 87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '19843ad15e5b461ffb061c2c9478054f4cde70da':

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Sep 2014 23:55:23 +0000 (23:55 +0000)]

am 184a7b4f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '184a7b4fd367a3d372efabc9aaf369b6ab8504d1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:55:22 +0000 (23:55 +0000)]

am 357e2826: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev

* commit '357e2826e166821e489607e9ae4006fed19cf57a':

commit | commitdiff | tree

PauloftheWest [Mon, 15 Sep 2014 23:55:21 +0000 (23:55 +0000)]

am 0410a1e3: am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev

* commit '0410a1e327f5276cc600ebda87ee0983f94b3891':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:20 +0000 (23:55 +0000)]

am e758df57: am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev

* commit 'e758df576a099920e00ec360267439b4a719c2ad':

commit | commitdiff | tree

Chris Wren [Mon, 15 Sep 2014 23:55:19 +0000 (23:55 +0000)]

am dd95e098: am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle."

* commit 'dd95e098f4e2b8d361df19964ab1ca6701840882':

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help