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

Amith Yamasani [Wed, 30 Jul 2014 16:39:23 +0000 (16:39 +0000)]

am 736ea0e8: am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev

* commit '736ea0e8a8943cb213b385ce8e260628d88f3b3f':
Implement SET_PROFILE_OWNER intent

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 30 Jul 2014 16:39:17 +0000 (16:39 +0000)]

am 04d3520a: am 9ee40022: Merge "Make Battery History chart non selectable" into lmp-dev

* commit '04d3520a07912864bac4d25c48b34cf2f18e7157':
Make Battery History chart non selectable

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 30 Jul 2014 16:38:45 +0000 (16:38 +0000)]

am 6662865e: am db7d2d16: Merge "Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev

* commit '6662865efa9ebef4d8f3a407a22c81c66923e576':
Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 30 Jul 2014 14:16:13 +0000 (14:16 +0000)]

am 10fb4706: am 76307f52: Merge "Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment@3c1d9ecb was not registered" into lmp-dev

* commit '10fb470622b7c3fddd8603be091b1429599b9bb2':
Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered

commit | commitdiff | tree

Amith Yamasani [Tue, 29 Jul 2014 23:47:00 +0000 (23:47 +0000)]

am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev

* commit 'ba9643b92c6fa481152f55b862442f609c1e7410':
Implement SET_PROFILE_OWNER intent

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 23:40:30 +0000 (23:40 +0000)]

am 9ee40022: Merge "Make Battery History chart non selectable" into lmp-dev

* commit '9ee4002288cd2bc455a5def8316456fd74c2551c':
Make Battery History chart non selectable

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 23:26:04 +0000 (23:26 +0000)]

am db7d2d16: Merge "Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev

* commit 'db7d2d16b1b3a7fdad8657a57fdcf8801e72a2c4':
Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 23:13:41 +0000 (23:13 +0000)]

am 76307f52: Merge "Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment@3c1d9ecb was not registered" into lmp-dev

* commit '76307f52d0cb097f832aec2a353ee31bfdff78a7':
Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 23:34:26 +0000 (23:34 +0000)]

Merge "Make Battery History chart non selectable" into lmp-dev

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 23:29:00 +0000 (16:29 -0700)]

Make Battery History chart non selectable

- ... because it should not be selectable

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I625d1533991623f5c3897be15ccfa48fd0fc02f8

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 23:15:27 +0000 (16:15 -0700)]

Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView...
startServiceDetailsActivity(RunningProcessesView.java:394)

- make the ListView header non selectable

Change-Id: Ic5e888a7d1d3d1df1bcb59f3027e4385d46ba5ca

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 23:02:22 +0000 (16:02 -0700)]

Fix bug #16660405 Stability: ISE in Settings: Observer ...
com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered

- use a monitor to control registering / unregistering

Change-Id: Id66dd698abf92643c97938e2091c3be38e6b78bd

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 23:07:27 +0000 (23:07 +0000)]

Merge "Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered" into lmp-dev

commit | commitdiff | tree

Svetoslav [Tue, 29 Jul 2014 20:27:44 +0000 (20:27 +0000)]

am e3de4ca0: am 01daaca5: Remove unnecessary code.

* commit 'e3de4ca04cb0a15e0cc3588eff9f6544427ce208':
Remove unnecessary code.

commit | commitdiff | tree

Svetoslav [Tue, 29 Jul 2014 20:24:01 +0000 (20:24 +0000)]

am 01daaca5: Remove unnecessary code.

* commit '01daaca5475930e394295b06f5a46dc057b44b0f':
Remove unnecessary code.

commit | commitdiff | tree

Svetoslav [Tue, 29 Jul 2014 20:16:12 +0000 (13:16 -0700)]

Remove unnecessary code.

Change-Id: I4a81cd7f855bb075ab71f6c6c812288e3677c90a

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 17:32:42 +0000 (17:32 +0000)]

am c13c0bd5: am d5ec63ad: Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev

* commit 'c13c0bd5dd0784c484a9e5088e0b4007be2d3965':
Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 17:24:31 +0000 (17:24 +0000)]

am d5ec63ad: Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev

* commit 'd5ec63ad5166b2a6530c2958819a053cccf4ec79':
Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum

commit | commitdiff | tree

Jay Civelli [Tue, 29 Jul 2014 17:08:25 +0000 (17:08 +0000)]

am b3891f44: am 09b5228a: New activity that asks users to confirm their pattern. DO NOT MERGE

* commit 'b3891f448768fd4263dd53cbb358b9b57f64ae10':
New activity that asks users to confirm their pattern. DO NOT MERGE

commit | commitdiff | tree

Jay Civelli [Tue, 29 Jul 2014 17:02:48 +0000 (17:02 +0000)]

am 09b5228a: New activity that asks users to confirm their pattern. DO NOT MERGE

* commit '09b5228ae56283ebcb69d1c295033c74ea868ae5':
New activity that asks users to confirm their pattern. DO NOT MERGE

commit | commitdiff | tree

Jay Civelli [Fri, 11 Jul 2014 00:27:07 +0000 (17:27 -0700)]

New activity that asks users to confirm their pattern. DO NOT MERGE

Adds an activity that prompts the user for their PIN/password/pattern.

cherry-pick from master b88e8577b9049392aa50649cb40edc845d43d689

Bug 16242766

Change-Id: I3468215a8ac522a06de6573c93a5f5a6dc72ee2d

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 15:36:14 +0000 (15:36 +0000)]

am 6d09e061: am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev

* commit '6d09e061ef6fd524e39b8d9ff87ba586c17c2d32':
Move global sync settings dialogs to the right screen

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 15:31:52 +0000 (15:31 +0000)]

am c7142442: am 9017d3fd: Update the resource name to the new ic_corp prefix one.

* commit 'c7142442e617c99d0a67ea0de5c57b26c4ca5206':
Update the resource name to the new ic_corp prefix one.

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 15:31:48 +0000 (15:31 +0000)]

am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev

* commit '4a45be2ff83e1b3b9bd52be523639d100311bec3':
Move global sync settings dialogs to the right screen

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 15:27:24 +0000 (15:27 +0000)]

am 9017d3fd: Update the resource name to the new ic_corp prefix one.

* commit '9017d3fdd607b8978299578721303b8140a64c22':
Update the resource name to the new ic_corp prefix one.

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 10:34:28 +0000 (11:34 +0100)]

Update the resource name to the new ic_corp prefix one.

Bug: 16369104
Change-Id: I0cd2188b0ac1806487678c568db068995a1e9142

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 13:29:13 +0000 (13:29 +0000)]

am 4b7e002b: am a6145a65: Toggle between primary and managed profile in App notif settings

* commit '4b7e002b7dc471b273b1a597c7ac03dc2220cd88':
Toggle between primary and managed profile in App notif settings

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 13:24:25 +0000 (13:24 +0000)]

am a6145a65: Toggle between primary and managed profile in App notif settings

* commit 'a6145a656af1241fd771038715cf839a8fce76e1':
Toggle between primary and managed profile in App notif settings

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 29 Jul 2014 13:14:57 +0000 (13:14 +0000)]

am 46c8a9bf: am 0598e6f6: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev

* commit '46c8a9bf8e90f58dd9003c2af836aa578221f1a9':
Fix refresh issue of badged icons in Battery Settings

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 29 Jul 2014 13:14:56 +0000 (13:14 +0000)]

am b77ef9be: am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev

* commit 'b77ef9bee2595d5d375cde3cf829a153d668af0d':
Update Data Usage Settings for Enterprise

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 13:14:55 +0000 (13:14 +0000)]

am 0d78165a: am 11b8bda9: Refactors listening logic in AccountSettings

* commit '0d78165af6ad82f48c4a7cdf9f9a5aaf1bb57655':
Refactors listening logic in AccountSettings

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 13:14:53 +0000 (13:14 +0000)]

am 76cc239f: am fe47a8dc: Toggle between primary and managed profile in Print Settings

* commit '76cc239fba1555b96c43a7b3b404477e0d5bde68':
Toggle between primary and managed profile in Print Settings

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 16:28:36 +0000 (17:28 +0100)]

Toggle between primary and managed profile in App notif settings

This adds a spinner to the app notifications screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I31c2fb4c0bc318fb8fa5c152621a29fd0c4bb403

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 29 Jul 2014 12:49:32 +0000 (12:49 +0000)]

am 0598e6f6: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev

* commit '0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed':
Fix refresh issue of badged icons in Battery Settings

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 29 Jul 2014 12:49:27 +0000 (12:49 +0000)]

am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev

* commit '74f34e496fc460842aa558512de03187f5ad9b2c':
Update Data Usage Settings for Enterprise

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 12:49:26 +0000 (12:49 +0000)]

am 11b8bda9: Refactors listening logic in AccountSettings

* commit '11b8bda93cf3acf3b699eeb479a99e09682a369d':
Refactors listening logic in AccountSettings

commit | commitdiff | tree

Alexandra Gherghina [Tue, 29 Jul 2014 12:49:25 +0000 (12:49 +0000)]

am fe47a8dc: Toggle between primary and managed profile in Print Settings

* commit 'fe47a8dc89fe0393dae16b1c2152c901feab4dcb':
Toggle between primary and managed profile in Print Settings

commit | commitdiff | tree

Alexandra Gherghina [Wed, 23 Jul 2014 15:19:08 +0000 (16:19 +0100)]

Refactors listening logic in AccountSettings

This is required to make sure that we do not leak broadcast receivers.
No user-visible changes are present.

Bug: 15466880
Change-Id: I90fcf9f8281a786948d862f48a3d7e7ac2bbe6ba

commit | commitdiff | tree

Alexandra Gherghina [Fri, 18 Jul 2014 16:23:37 +0000 (17:23 +0100)]

Toggle between primary and managed profile in Print Settings

This adds a spinner to the print settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5

commit | commitdiff | tree

John Spurlock [Tue, 29 Jul 2014 02:19:52 +0000 (02:19 +0000)]

am a758ad97: am b8ec3434: Settings: Carve out app-level notifcation settings dialog.

* commit 'a758ad97466c6c252060d38ae62d4c32a34bb3fb':
Settings: Carve out app-level notifcation settings dialog.

commit | commitdiff | tree

John Spurlock [Tue, 29 Jul 2014 02:15:24 +0000 (02:15 +0000)]

am b8ec3434: Settings: Carve out app-level notifcation settings dialog.

* commit 'b8ec34346495245043933ac0f1b78781ae5054db':
Settings: Carve out app-level notifcation settings dialog.

commit | commitdiff | tree

John Spurlock [Sun, 27 Jul 2014 17:33:34 +0000 (13:33 -0400)]

Settings: Carve out app-level notifcation settings dialog.

Bug:16208321
Change-Id: I46574618518e8fe4cbef70e80204cc7bb7cb76e9

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 02:08:37 +0000 (02:08 +0000)]

am 17aff4af: am 3a166613: Merge "Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev

* commit '17aff4af2c51346dde614fc14d85fa7fb6465eca':
Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 02:04:05 +0000 (02:04 +0000)]

am 3a166613: Merge "Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev

* commit '3a166613becfb8de08939616d2dd6d28c180a130':
Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 01:39:12 +0000 (01:39 +0000)]

am 06db26bd: am 54bac5f2: Merge "Fix App Info padding" into lmp-dev

* commit '06db26bde9073975caa1b369b744968cbcfa32af':
Fix App Info padding

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 01:35:46 +0000 (01:35 +0000)]

am 54bac5f2: Merge "Fix App Info padding" into lmp-dev

* commit '54bac5f2c6e58fca8d1aa5cb4f5ed053a3559c02':
Fix App Info padding

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 01:09:40 +0000 (01:09 +0000)]

am bbd076c1: am 173e3161: Merge "Some code formatting" into lmp-dev

* commit 'bbd076c1f3d473e2aa37f9b15bb4807be1682ea6':
Some code formatting

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 01:03:58 +0000 (01:03 +0000)]

am 173e3161: Merge "Some code formatting" into lmp-dev

* commit '173e31619a34436e8cb100fb30f0e3477b7edf8e':
Some code formatting

commit | commitdiff | tree

Maurice Lam [Tue, 29 Jul 2014 00:56:17 +0000 (00:56 +0000)]

am 45ca3fed: am 569aec7b: [WifiSetup] Fix auto-finish suppression logic

* commit '45ca3fedea0d12a3532de7bba8aa84e57781f52e':
[WifiSetup] Fix auto-finish suppression logic

commit | commitdiff | tree

Alan Viverette [Tue, 29 Jul 2014 00:56:16 +0000 (00:56 +0000)]

am 6c27489f: am 744c6b22: Remove TimePicker and DatePicker dialog themes

* commit '6c27489f4080dc8ba446992e10a1ae09beca1200':
Remove TimePicker and DatePicker dialog themes

commit | commitdiff | tree

Maurice Lam [Tue, 29 Jul 2014 00:47:59 +0000 (00:47 +0000)]

am 569aec7b: [WifiSetup] Fix auto-finish suppression logic

* commit '569aec7b4d6cc9e5268a059d9f18f271afadb706':
[WifiSetup] Fix auto-finish suppression logic

commit | commitdiff | tree

Alan Viverette [Tue, 29 Jul 2014 00:47:58 +0000 (00:47 +0000)]

am 744c6b22: Remove TimePicker and DatePicker dialog themes

* commit '744c6b22513f3b51f035b2038a59d35c97c4da6c':
Remove TimePicker and DatePicker dialog themes

commit | commitdiff | tree

Maurice Lam [Fri, 25 Jul 2014 19:40:55 +0000 (12:40 -0700)]

[WifiSetup] Fix auto-finish suppression logic

The flag needs to be saved into the instance state, and the flag is
set as soon as auto-finish occurs to avoid multi-launching the next
activity.

Bug: 16561238
Change-Id: I954b7ff77b2d2fc35684ea59cca7d7cd588a6aab

commit | commitdiff | tree

Alan Viverette [Mon, 28 Jul 2014 23:29:58 +0000 (16:29 -0700)]

Remove TimePicker and DatePicker dialog themes

Also moves TimePicker widget style to appropriate XML file / namespace.

BUG: 14973897
Change-Id: I0eb68a59d8f2800d37cc949c948689d47c34486f

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Jul 2014 23:21:53 +0000 (23:21 +0000)]

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

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 28 Jul 2014 23:21:52 +0000 (23:21 +0000)]

am 90bfe0cf: am d197608e: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev

* commit '90bfe0cf7e3ba44e5662a39d3a2f3b247abf8395':
Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Jul 2014 23:15:48 +0000 (23:15 +0000)]

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

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

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 28 Jul 2014 23:15:47 +0000 (23:15 +0000)]

am d197608e: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev

* commit 'd197608e8340765e736c234dabffae8d3dc695e1':
Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 01:59:53 +0000 (01:59 +0000)]

Merge "Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 01:55:29 +0000 (18:55 -0700)]

Fix bug #16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)

- add correct padding

Change-Id: I08a34839f94e899469b429dd83e301c5418155f5

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 01:25:14 +0000 (18:25 -0700)]

Fix App Info padding

- need to add to the previous defined on instead of replacing it
- verified also that Notification Station padding is ok too

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I06394bec2a5baa548f34f3fe7ec19d60172a98e8

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 00:54:30 +0000 (17:54 -0700)]

Some code formatting

- add some extra lines into those XML layout files

Change-Id: I13c004f23a5c59d46702a93b1cfa7e9b9587b8c2

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 28 Jul 2014 22:47:21 +0000 (15:47 -0700)]

Fix bug #14323097 Launching Security from Settings search results
...show header as Settings instead of Security

- add missing title to a few fragments

Change-Id: I74fb95ca58269ff1c77afa20ed40e7042873130c

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 29 Jul 2014 01:01:03 +0000 (01:01 +0000)]

Merge "Some code formatting" into lmp-dev

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 28 Jul 2014 22:54:48 +0000 (22:54 +0000)]

Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev

commit | commitdiff | tree

Jeff Davidson [Mon, 28 Jul 2014 20:45:54 +0000 (20:45 +0000)]

am 92126c1c: am 6207391a: Fix strings for Wi-Fi Assistant dialog.

* commit '92126c1c9cee744b6874cfd8390f0905c624a6d7':
Fix strings for Wi-Fi Assistant dialog.

commit | commitdiff | tree

Jeff Davidson [Mon, 28 Jul 2014 20:41:15 +0000 (20:41 +0000)]

am 6207391a: Fix strings for Wi-Fi Assistant dialog.

* commit '6207391ac240d130194f1a0cad7b5f10535d45ac':
Fix strings for Wi-Fi Assistant dialog.

commit | commitdiff | tree

Jeff Davidson [Fri, 25 Jul 2014 21:58:20 +0000 (14:58 -0700)]

Fix strings for Wi-Fi Assistant dialog.

Remove some redundant strings that are no longer needed.

Change-Id: I039839989358efa322bac13129d91f7c764fd387

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 20:07:24 +0000 (20:07 +0000)]

am 77ae82b0: am 34652902: Merge "Removed Wi-Fi icon from Saved Networks." into lmp-dev

* commit '77ae82b05192bbc02e7303f3b4b353739004b6b8':
Removed Wi-Fi icon from Saved Networks.

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 20:03:10 +0000 (20:03 +0000)]

am 34652902: Merge "Removed Wi-Fi icon from Saved Networks." into lmp-dev

* commit '346529021de468cbf98fc419c6bab04dc3f3fc52':
Removed Wi-Fi icon from Saved Networks.

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 19:42:55 +0000 (19:42 +0000)]

am ef1bbaa3: am 68af3173: Merge "Fixed a bug where Wi-Fi would should networks out of range." into lmp-dev

* commit 'ef1bbaa3dd4c42f7898577153a2cf68f78f409c7':
Fixed a bug where Wi-Fi would should networks out of range.

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 19:35:52 +0000 (19:35 +0000)]

am 68af3173: Merge "Fixed a bug where Wi-Fi would should networks out of range." into lmp-dev

* commit '68af317321693984ec54caa6abcb39f6627d291f':
Fixed a bug where Wi-Fi would should networks out of range.

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 18:48:22 +0000 (18:48 +0000)]

am 7359836b: am 069ed0a6: Merge "Minor character limit fixes for translation." into lmp-dev

* commit '7359836b01166135aa29a73c499dcb8d10875f6a':
Minor character limit fixes for translation.

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 18:43:47 +0000 (18:43 +0000)]

am 069ed0a6: Merge "Minor character limit fixes for translation." into lmp-dev

* commit '069ed0a678dca7a00fb236ed3ba5e54ea4ee2905':
Minor character limit fixes for translation.

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 17:57:34 +0000 (17:57 +0000)]

am 0314d6d6: am 76c70b07: Merge "Fixed minor character limits for translation." into lmp-dev

* commit '0314d6d694c4881b36e89183ff612c4ab4a4d331':
Fixed minor character limits for translation.

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 17:49:35 +0000 (17:49 +0000)]

am 76c70b07: Merge "Fixed minor character limits for translation." into lmp-dev

* commit '76c70b07270f3e0bea5e94f172d5115c8dffef12':
Fixed minor character limits for translation.

commit | commitdiff | tree

Alexandra Gherghina [Mon, 28 Jul 2014 14:33:34 +0000 (14:33 +0000)]

am 3f0140ec: am 28ff0ff0: Update string displayed when we can\'t remove an account

* commit '3f0140ec4d5e305b47b5ff713aec9b1136fea1e7':
Update string displayed when we can't remove an account

commit | commitdiff | tree

Alexandra Gherghina [Mon, 28 Jul 2014 14:29:59 +0000 (14:29 +0000)]

am 28ff0ff0: Update string displayed when we can\'t remove an account

* commit '28ff0ff0f19b3ef2a665d72020509d106bf6e73f':
Update string displayed when we can't remove an account

commit | commitdiff | tree

Alexandra Gherghina [Fri, 25 Jul 2014 15:22:17 +0000 (16:22 +0100)]

Update string displayed when we can't remove an account

Bug: 14642886
Change-Id: Ie4a902cfd1ae41f2a1bae28432874e7b8b34b50d

commit | commitdiff | tree

Alexandra Gherghina [Mon, 28 Jul 2014 12:09:00 +0000 (12:09 +0000)]

am aef3a97c: am 95b86a54: Refactoring useless UserUtils class

* commit 'aef3a97c86164e3ad343f8a6924ea5172575d68c':
Refactoring useless UserUtils class

commit | commitdiff | tree

Tadashi G. Takaoka [Mon, 28 Jul 2014 12:09:00 +0000 (12:09 +0000)]

am 5f3fea65: am 72f70723: Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev

* commit '5f3fea65721add7db4fc3790ab4accebbb886d14':
Preserve enabled subtypes across disabling and re-enabling an IME

commit | commitdiff | tree

Lajos Molnar [Mon, 28 Jul 2014 12:08:59 +0000 (12:08 +0000)]

am 3e940224: am dc3bc0ba: Make nuplayer the default media player.

* commit '3e9402244e6153aaf9b2b569350ecf1d19e8996c':
Make nuplayer the default media player.

commit | commitdiff | tree

Alexandra Gherghina [Mon, 28 Jul 2014 11:59:19 +0000 (11:59 +0000)]

am 95b86a54: Refactoring useless UserUtils class

* commit '95b86a5488a27d95bda8b6db1f608d6ce55dae8a':
Refactoring useless UserUtils class

commit | commitdiff | tree

Tadashi G. Takaoka [Mon, 28 Jul 2014 11:58:59 +0000 (11:58 +0000)]

am 72f70723: Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev

* commit '72f7072328539d58ba02a6851e9e292a750f7d20':
Preserve enabled subtypes across disabling and re-enabling an IME

commit | commitdiff | tree

Lajos Molnar [Mon, 28 Jul 2014 11:58:57 +0000 (11:58 +0000)]

am dc3bc0ba: Make nuplayer the default media player.

* commit 'dc3bc0ba6be006c89b9674cdcc23b3972b7b1052':
Make nuplayer the default media player.

commit | commitdiff | tree

Alexandra Gherghina [Thu, 24 Jul 2014 18:13:25 +0000 (19:13 +0100)]

Refactoring useless UserUtils class

Bug: 16542609
Change-Id: Iadb83c5e378cd342ea89d6e224ddc45e6f940c8b

commit | commitdiff | tree

Lajos Molnar [Mon, 28 Jul 2014 04:35:37 +0000 (21:35 -0700)]

Make nuplayer the default media player.

Update nuplayer settings to use awesomeplayer key.

Bug: 11784824
Change-Id: I25ec4b4bd289e3f00c3d299b1a3a5275d1ba73fe

commit | commitdiff | tree

Tadashi G. Takaoka [Mon, 28 Jul 2014 02:43:11 +0000 (02:43 +0000)]

am 666ff86d: am 935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev

* commit '666ff86d85e1932a16924614eeeb2cbd7d5297e4':
Show "up navigate" icon in input method subtype enabler

commit | commitdiff | tree

Tadashi G. Takaoka [Mon, 28 Jul 2014 02:39:53 +0000 (02:39 +0000)]

am 935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev

* commit '935f97cd9bc38fefc5b3358a2151440b85c54c32':
Show "up navigate" icon in input method subtype enabler

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Jul 2014 23:13:05 +0000 (23:13 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Mon, 28 Jul 2014 20:01:38 +0000 (13:01 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9653e86e7b7264646b35675fd40f6d582dc09d58
Auto-generated-cl: translation import

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 19:58:41 +0000 (19:58 +0000)]

Merge "Removed Wi-Fi icon from Saved Networks." into lmp-dev

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 19:55:45 +0000 (12:55 -0700)]

Removed Wi-Fi icon from Saved Networks.

Bug: 16569017
Change-Id: I13b7e0ae2a364d2660c8bfa42ebdf0b2cf3ab407

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 19:23:18 +0000 (12:23 -0700)]

Fixed a bug where Wi-Fi would should networks out of range.

Bug: 16569017
Change-Id: Ie2d094aed2fcb1b2471ae1105b6782105e6be5ce

commit | commitdiff | tree

PauloftheWest [Mon, 28 Jul 2014 19:32:29 +0000 (19:32 +0000)]

Merge "Fixed a bug where Wi-Fi would should networks out of range." into lmp-dev

commit | commitdiff | tree

Amith Yamasani [Sun, 27 Jul 2014 11:43:34 +0000 (11:43 +0000)]

am 5573c5e3: am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev

* commit '5573c5e3cd11c9347096be9299bcf5b54e0121ae':
Increase string lengths for translation

commit | commitdiff | tree

Amith Yamasani [Sun, 27 Jul 2014 11:30:12 +0000 (11:30 +0000)]

am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev

* commit 'bed3a7b6aa64a82504057a10a1c38a82feffcc38':
Increase string lengths for translation

commit | commitdiff | tree

Amith Yamasani [Sat, 26 Jul 2014 23:59:38 +0000 (23:59 +0000)]

am ee4e67aa: am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone

* commit 'ee4e67aa278d2688c42bd8e389311930dbeb3cef':
Change tablet to device so it doesn't say tablet on a phone

commit | commitdiff | tree

Amith Yamasani [Sat, 26 Jul 2014 23:57:25 +0000 (23:57 +0000)]

am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone

* commit '1a77577da755b0921a3b77fc66ff9b99b50b59f6':
Change tablet to device so it doesn't say tablet on a phone

commit | commitdiff | tree

Amith Yamasani [Sat, 26 Jul 2014 23:47:00 +0000 (16:47 -0700)]

Change tablet to device so it doesn't say tablet on a phone

Bug: 16447351
Change-Id: I3d10e1e1546602c4155de70650e6f9ee582fe552