OSDN Git Service
Selim Gurun [Mon, 16 Jun 2014 23:45:53 +0000 (16:45 -0700)]
Do not enable bandwidth reduction settings if key is not available
Bug:
15607413
If bandwidth reduction settings are enabled when a key is not ready
yet, webview network connections stall due to a bug in M36 of chrome.
Do not let it enabled via settings app.
Change-Id: I7dc80c33f72ab59de68f919ef227d5227e6b923d
Baligh Uddin [Mon, 16 Jun 2014 16:28:48 +0000 (16:28 +0000)]
am
e87811a4: (-s ours) Import translations. DO NOT MERGE
* commit '
e87811a40ef76b55b2912d52a07f4e84feb02a59':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 13 Jun 2014 21:56:38 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib5764937241b6b8d3f92d8e9c20f88a61908af0a
Auto-generated-cl: translation import
Baligh Uddin [Sun, 15 Jun 2014 13:03:30 +0000 (13:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 13 Jun 2014 22:02:04 +0000 (15:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I78790de98e3587253d8d1718fd86d5bf36422423
Auto-generated-cl: translation import
Paul Lawrence [Sat, 14 Jun 2014 13:19:03 +0000 (13:19 +0000)]
Merge "Show time to go while encrypting drive"
Colin Cross [Fri, 13 Jun 2014 23:26:15 +0000 (23:26 +0000)]
Revert "logd: Add Developer settings for size, merge conflict issue"
This reverts commit
c6d03a828ed3546a229622bff14620a883a0c609.
Change-Id: Ic41bf8609a1e16a10bfdce021e0536370800b81e
Mark Salyzyn [Tue, 6 May 2014 15:44:57 +0000 (08:44 -0700)]
logd: Add Developer settings for size, merge conflict issue
- mLogdSize dropped by merge conflict resolution
Bug:
14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e985
Mark Salyzyn [Fri, 13 Jun 2014 21:57:13 +0000 (14:57 -0700)]
resolved conflicts for merge of
c2c64a31 to master
Change-Id: Ica0f138d4bf2cf66b8ba485bf286e062be433d0a
Fabrice Di Meglio [Fri, 13 Jun 2014 02:57:39 +0000 (19:57 -0700)]
Fix padding issue with Dream list item
- needs to use the standard Framework one
See bug: #
15384992 Setting Dashboard - padding updates
Change-Id: I4f7bb003c928a799bf8b77fce3c4869671816265
Fabrice Di Meglio [Fri, 13 Jun 2014 18:35:48 +0000 (11:35 -0700)]
Fix bug #
15611108 Stability: CursorIndexOutOfBoundsException in Settings: Index -1 requested, with a size of 1
- do not allow to have position < 0
A use case was generated by the Monkeys where they were capable to click on the Header.
Change-Id: I3a8ded4c1471a1589134826539c9db1b551f49dd
Mark Salyzyn [Fri, 13 Jun 2014 20:27:25 +0000 (20:27 +0000)]
am
5a9a18c1: Merge "logd: Add Developer settings for size"
* commit '
5a9a18c15b16be282ed48df0fa38045ae9016524':
logd: Add Developer settings for size
Julia Reynolds [Fri, 13 Jun 2014 17:31:01 +0000 (17:31 +0000)]
Merge "Remove pin and add restrictions for Security settings."
Julia Reynolds [Thu, 12 Jun 2014 15:49:12 +0000 (11:49 -0400)]
Remove pin and add restrictions for Security settings.
Bug:
14081992
Change-Id: Iec5667202b6f5ae5b5a2a0cfded1a832d98adaf9
Mark Salyzyn [Fri, 13 Jun 2014 20:20:45 +0000 (20:20 +0000)]
Merge "logd: Add Developer settings for size"
Mark Salyzyn [Mon, 12 May 2014 17:19:09 +0000 (10:19 -0700)]
logd: Add Developer settings for size
- Dependent on some logd/init/selinux security changes.
Bug:
14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e984
Paul Lawrence [Fri, 13 Jun 2014 00:02:39 +0000 (00:02 +0000)]
Merge "DO NOT MERGE: Set quantum pattern for crypt dialogs" into lmp-preview-dev
Dianne Hackborn [Thu, 12 Jun 2014 23:40:56 +0000 (16:40 -0700)]
Fix issue #
15597136: n7 not showing estimated discharge time
Use battery plugged state to decide whether to show the estimated
discharge time remaining vs. charge time remaining.
Change-Id: I2e0d12871201e7d4927aaa9a94d15bff949a881c
Paul Lawrence [Wed, 11 Jun 2014 22:24:37 +0000 (15:24 -0700)]
DO NOT MERGE: Set quantum pattern for crypt dialogs
The bug makes the decrypt screen for patterns very hard to use
(white on white).
Bug:
14883421
Change-Id: Icd2c99c3f483d1a9b6571fa1e124322fbf6f3289
(cherry picked from commit
26abe64c3d7e48d2a929d5a9435e0bb4c17d80a4)
Fabrice Di Meglio [Thu, 12 Jun 2014 20:42:23 +0000 (20:42 +0000)]
Merge "Make the SwitchBar appear immediately" into lmp-preview-dev
Fabrice Di Meglio [Thu, 12 Jun 2014 03:14:15 +0000 (20:14 -0700)]
Make the SwitchBar appear immediately
- change the way the SwitchBar is shown and hidden
- save its state
- remove the delay transition code
Change-Id: I07260430e6709b42517ca011f6d3c3446a626731
John Spurlock [Thu, 12 Jun 2014 15:34:56 +0000 (11:34 -0400)]
Settings: Workaround duplicate onActivityCreate
Bug:
13329308
Change-Id: Ia6b8cf766d517b4e8e5689e33cbb52299471407b
Fabrice Di Meglio [Wed, 11 Jun 2014 22:00:12 +0000 (15:00 -0700)]
Fix bug #
15384992 Setting Dashboard - padding updates
- make padding start / end to "0dip" for Preferences ListView
- update also Battery History Chart padding to be compatible
with other layouts
See bug: #
15384992 Setting Dashboard - padding updates
Change-Id: I1faae1186322965d7077e92418a507720bab75cf
Alan Viverette [Thu, 12 Jun 2014 02:00:19 +0000 (02:00 +0000)]
Merge "Add Settings theme" into lmp-preview-dev
Alan Viverette [Thu, 12 Jun 2014 01:35:18 +0000 (18:35 -0700)]
Add Settings theme
Also removes unused colors.
Change-Id: Iadf4d72879ea34eab91a9efe02102a6e35be82eb
Fabrice Di Meglio [Wed, 11 Jun 2014 19:11:48 +0000 (12:11 -0700)]
Fix bug #
15558357 java.lang.RuntimeException: Unable to start activity
...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}
- add missing attributes to SetupWizard themes
Change-Id: I5d58df8edfcfff4902b714c38dbdbc3933c9323d
Fabrice Di Meglio [Wed, 11 Jun 2014 18:27:54 +0000 (11:27 -0700)]
Fix bug #
15543626 Bluetooth Settings headers need to support Quantum styling
- per UX request
- remove the TextView "list separator" styling and use the correct one
Change-Id: I54e41d89dd9b930cbaa04bc5b9ed9a5fd9b8605e
Dianne Hackborn [Wed, 11 Jun 2014 17:26:03 +0000 (17:26 +0000)]
Merge "Small fixes to power save UI." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 06:17:01 +0000 (23:17 -0700)]
Small fixes to power save UI.
Use the correct default setting, and don't crash.
Change-Id: I33fd612aba404e13c8bbe9110535dff1cfba12a4
Fabrice Di Meglio [Wed, 11 Jun 2014 16:56:12 +0000 (16:56 +0000)]
Merge "Fix bug #
15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev
Fabrice Di Meglio [Wed, 11 Jun 2014 03:20:52 +0000 (20:20 -0700)]
Fix bug #
15545573 Battery use chart is incorrect for date labels and time axis labels
- use DateFormat.getBestDateTimePattern(...) to get the best Date and Time format
depending on the Locale
- format the label according to the best format
- remove non needed formatting strings
Change-Id: I78b62b9a7c9401e47e62c7161214636bb43324fc
Fabrice Di Meglio [Wed, 11 Jun 2014 00:12:51 +0000 (17:12 -0700)]
Update Settings redlines per UX request
See bug: #
15384992 Setting Dashboard - padding updates
Change-Id: Ie95b6cee701847d7f76f2e2a72aaf8fc64bc4dd9
Fabrice Di Meglio [Wed, 11 Jun 2014 02:41:53 +0000 (02:41 +0000)]
Merge "Update Settings redlines per UX request" into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 23:35:09 +0000 (23:35 +0000)]
Merge "I am a Material girl, living in a Material world." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 23:26:41 +0000 (16:26 -0700)]
I am a Material girl, living in a Material world.
Change-Id: I3206041666a3236fdeb5f5897e6d8767137c2b85
Fabrice Di Meglio [Wed, 11 Jun 2014 23:31:50 +0000 (23:31 +0000)]
Merge "Fix bug #
15384992 Setting Dashboard - padding updates" into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 23:03:21 +0000 (23:03 +0000)]
Merge "In a document centric world, hiding from recents makes no sense." into lmp-preview-dev
Dianne Hackborn [Wed, 11 Jun 2014 22:56:19 +0000 (15:56 -0700)]
In a document centric world, hiding from recents makes no sense.
Change-Id: I462649a0663cc54c60303392168624483d6a1e17
Julia Reynolds [Thu, 12 Jun 2014 12:39:28 +0000 (12:39 +0000)]
Merge "Remove PIN from users page - use disallow_add/remove_user restrictions."
Paul Lawrence [Thu, 12 Jun 2014 00:06:31 +0000 (00:06 +0000)]
Merge "Set quantum pattern for crypt dialogs"
Dianne Hackborn [Thu, 12 Jun 2014 00:03:50 +0000 (00:03 +0000)]
am
2f2cbbc7: Merge "Small fixes to power save UI." into lmp-preview-dev
* commit '
2f2cbbc760c23d89c5b0255378bbf5cb074a6988':
Small fixes to power save UI.
Fabrice Di Meglio [Thu, 12 Jun 2014 00:03:34 +0000 (00:03 +0000)]
am
782d0f68: Merge "Fix bug #
15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev
* commit '
782d0f689106aed05de80e93948f9e7b30701601':
Fix bug #
15545573 Battery use chart is incorrect for date labels and time axis labels
Paul Lawrence [Wed, 11 Jun 2014 22:24:37 +0000 (15:24 -0700)]
Set quantum pattern for crypt dialogs
Bug:
14883421
Change-Id: Icd2c99c3f483d1a9b6571fa1e124322fbf6f3289
vandwalle [Wed, 11 Jun 2014 23:35:29 +0000 (23:35 +0000)]
Merge "remove disbaled for unknown reason status"
Julia Reynolds [Wed, 11 Jun 2014 20:18:16 +0000 (16:18 -0400)]
Remove PIN from users page - use disallow_add/remove_user restrictions.
Bug:
14081992
Change-Id: If4973d64ae54da602a2682dee5b868ff66273856
Fabrice Di Meglio [Wed, 11 Jun 2014 17:43:44 +0000 (17:43 +0000)]
am
1c3203e8: Merge "Update Settings redlines per UX request" into lmp-preview-dev
* commit '
1c3203e83efed2d5c257da8e4f5fba4844b6fa47':
Update Settings redlines per UX request
John Spurlock [Wed, 11 Jun 2014 17:02:20 +0000 (17:02 +0000)]
am
e9ee5e2c: Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev
* commit '
e9ee5e2cede8d7e8fd7791113903df7eff1ec75a':
Settings: Battery saver settings sub-page.
Martijn Coenen [Wed, 11 Jun 2014 17:02:19 +0000 (17:02 +0000)]
am
8da48ee8: Remove obsolete NFC unlock XML file.
* commit '
8da48ee882825c43bce7068382ad730fbbc060e7':
Remove obsolete NFC unlock XML file.
Alan Viverette [Wed, 11 Jun 2014 13:07:58 +0000 (13:07 +0000)]
am
6bfec2d6: Remove all dialog icons in Settings
* commit '
6bfec2d6b197068dd355bd1742179fe3da07136f':
Remove all dialog icons in Settings
Alan Viverette [Wed, 11 Jun 2014 13:07:56 +0000 (13:07 +0000)]
am
a29f3bbf: Merge "Ripple tint is now color" into lmp-preview-dev
* commit '
a29f3bbff43c33aedd028a852bfaf53325fe2538':
Ripple tint is now color
Baligh Uddin [Wed, 11 Jun 2014 12:41:37 +0000 (12:41 +0000)]
am
bb883075: Merge "Breaks the build. Issue being tracked in b/
15538481" into lmp-preview-dev
* commit '
bb8830756fec3c6ee66b87eb7fe6822d038147ce':
Breaks the build. Issue being tracked in b/
15538481
Fabrice Di Meglio [Wed, 11 Jun 2014 12:41:35 +0000 (12:41 +0000)]
am
df055ead: Merge "Replace ic_settings_language.png asset to the new one" into lmp-preview-dev
* commit '
df055ead66b11fdc28f9af5641013705d064b516':
Replace ic_settings_language.png asset to the new one
Baligh Uddin [Wed, 11 Jun 2014 11:24:36 +0000 (11:24 +0000)]
am
eff52add: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '
eff52addfc1c27d9aadbefe7e1e91f2bb2647ab6':
Import translations. DO NOT MERGE
vandwalle [Wed, 11 Jun 2014 03:47:19 +0000 (20:47 -0700)]
remove disbaled for unknown reason status
Change-Id: Id9fda1b6aeec8e7122a5c00996e5afbec20ac1cb
Jay Civelli [Wed, 11 Jun 2014 23:00:05 +0000 (23:00 +0000)]
Merge "Temporary removing the Trust Agent permission change."
Jay Civelli [Tue, 10 Jun 2014 23:09:00 +0000 (16:09 -0700)]
Temporary removing the Trust Agent permission change.
Removing the permission check for Trust Agents, until the GMS core prebuilt
has that permission.
BUG:
15546358
Change-Id: Ie0a68fcc313b835a8f5e87570fd248612c837bd3
John Spurlock [Wed, 11 Jun 2014 22:56:28 +0000 (22:56 +0000)]
Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev
John Spurlock [Wed, 11 Jun 2014 22:44:24 +0000 (18:44 -0400)]
Settings: Remove master swtich from battery saver.
And make it a normal switch called "Always on". Better reflects
the actual effect.
Change-Id: I9f801ddfff39591cb19d665f61a1a05bda317888
Vinit Deshpande [Wed, 11 Jun 2014 20:36:30 +0000 (13:36 -0700)]
Fix icon location on Wifi Settings
Wifi icons are showing up on the right of the name; which is unlike
other settings; this change fixes that.
Wifi settings are using standard preference layout; so moving to the
new location requires setting different property (icon instead of widget)
on the preference fragment.
Bug:
15117166
Change-Id: I5dd0a843139512d16fb70dd99ed12c3584f57895
Fabrice Di Meglio [Wed, 11 Jun 2014 19:13:23 +0000 (19:13 +0000)]
Merge "Fix bug #
15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}" into lmp-preview-dev
Robert Greenwalt [Wed, 11 Jun 2014 19:11:57 +0000 (19:11 +0000)]
Merge "Apply LinkProperties changes." into lmp-preview-dev
Robert Greenwalt [Sat, 7 Jun 2014 00:42:32 +0000 (17:42 -0700)]
Apply LinkProperties changes.
bug:
15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
(cherry picked from commit
51d898fd0223a4b7c728980ab987dd985c02df5f)
John Spurlock [Tue, 10 Jun 2014 21:36:18 +0000 (21:36 +0000)]
Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev
Przemyslaw Szczepaniak [Fri, 13 Jun 2014 12:04:26 +0000 (12:04 +0000)]
Merge "Expose "default tts locale" to the TTS V2 API."
Przemyslaw Szczepaniak [Fri, 30 May 2014 10:09:10 +0000 (11:09 +0100)]
Expose "default tts locale" to the TTS V2 API.
Accommodate for the changes in frameworks/base. TtsEngines now
uses Locale objects for setting/getting the default locale
for TTS engines.
Change-Id: I518ace8d16d17b2c36a62e4e9d14a3568a38f68e
vandwalle [Fri, 13 Jun 2014 03:31:04 +0000 (03:31 +0000)]
Merge "show frequency within debug settings"
vandwalle [Fri, 13 Jun 2014 02:51:24 +0000 (19:51 -0700)]
show frequency within debug settings
Change-Id: I6ebf08a193fc92b7e0289d663f089ba6e871497d
Paul Lawrence [Fri, 13 Jun 2014 00:05:02 +0000 (00:05 +0000)]
am
5b2ea2fd: (-s ours) Merge "DO NOT MERGE: Set quantum pattern for crypt dialogs" into lmp-preview-dev
* commit '
5b2ea2fd6f5d85f05cd48c0824531a65ead7ea3a':
DO NOT MERGE: Set quantum pattern for crypt dialogs
Dianne Hackborn [Thu, 12 Jun 2014 23:57:20 +0000 (23:57 +0000)]
am
b11c9737: Fix issue #
15597136: n7 not showing estimated discharge time
* commit '
b11c97379918fce423bfb0b96a8319a8e698845d':
Fix issue #
15597136: n7 not showing estimated discharge time
Fabrice Di Meglio [Thu, 12 Jun 2014 22:46:41 +0000 (15:46 -0700)]
resolved conflicts for merge of
f9360dbc to master
Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb
Ido Ofir [Thu, 12 Jun 2014 21:18:23 +0000 (14:18 -0700)]
Small fix to trust agent item in security settings.
Change-Id: Ie3157e0c9c68bbab5ba394f61c12d1bbf075bb06
John Spurlock [Thu, 12 Jun 2014 20:06:10 +0000 (20:06 +0000)]
am
5fe76205: Settings: Workaround duplicate onActivityCreate
* commit '
5fe76205b607f193b5925eccfabddc145118b5ea':
Settings: Workaround duplicate onActivityCreate
Alan Viverette [Thu, 12 Jun 2014 19:57:25 +0000 (19:57 +0000)]
am
8cd7dc23: Merge "Add Settings theme" into lmp-preview-dev
* commit '
8cd7dc23ec5e65504ea3f9c8d5869df2b670879d':
Add Settings theme
Dianne Hackborn [Thu, 12 Jun 2014 18:48:57 +0000 (18:48 +0000)]
am
9f789fbe: Merge "I am a Material girl, living in a Material world." into lmp-preview-dev
* commit '
9f789fbe082792f57dde72e6c5a501cd0441cd6f':
I am a Material girl, living in a Material world.
Fabrice Di Meglio [Thu, 12 Jun 2014 18:48:56 +0000 (18:48 +0000)]
am
deb08839: Merge "Fix bug #
15384992 Setting Dashboard - padding updates" into lmp-preview-dev
* commit '
deb088398900bd1c212889c59c9e057795d2b2bd':
Fix bug #
15384992 Setting Dashboard - padding updates
Dianne Hackborn [Thu, 12 Jun 2014 18:37:35 +0000 (18:37 +0000)]
am
3864cda8: Merge "In a document centric world, hiding from recents makes no sense." into lmp-preview-dev
* commit '
3864cda8fd9f136838481e07c4bd942012eb67ec':
In a document centric world, hiding from recents makes no sense.
John Spurlock [Thu, 12 Jun 2014 18:37:34 +0000 (18:37 +0000)]
am
26ac83df: Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev
* commit '
26ac83df5922430b7d7e3eee46c36c7d856bc47c':
Settings: Remove master swtich from battery saver.
Vinit Deshpande [Thu, 12 Jun 2014 18:37:22 +0000 (18:37 +0000)]
am
c8e2eeea: Fix icon location on Wifi Settings
* commit '
c8e2eeeaa1666d37abc16d0505a1ef6e9a5bae91':
Fix icon location on Wifi Settings
Fabrice Di Meglio [Thu, 12 Jun 2014 16:53:47 +0000 (16:53 +0000)]
am
f5440793: Merge "Fix bug #
15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}" into lmp-preview-dev
* commit '
f54407933fd30c0838fcd89d9f4dafaf7af865be':
Fix bug #
15558357 java.lang.RuntimeException: Unable to start activity ...ComponentInfo{com.android.settings/com.android.settings.wifi.WifiSetupActivity}
Robert Greenwalt [Thu, 12 Jun 2014 16:53:44 +0000 (16:53 +0000)]
am
746c6ae9: Merge "Apply LinkProperties changes." into lmp-preview-dev
* commit '
746c6ae9492f4e571a35fc07cc68a10b059eade5':
Apply LinkProperties changes.
Fabrice Di Meglio [Thu, 12 Jun 2014 16:07:29 +0000 (16:07 +0000)]
am
caf4b1dd: Fix bug #
15543626 Bluetooth Settings headers need to support Quantum styling
* commit '
caf4b1dda2e84760a230944e50569712a39c200c':
Fix bug #
15543626 Bluetooth Settings headers need to support Quantum styling
Martijn Coenen [Tue, 10 Jun 2014 20:54:23 +0000 (13:54 -0700)]
Remove obsolete NFC unlock XML file.
NFC unlock was moved to TrustAgent. Fixes
build break.
Bug:
15538481
Change-Id: Iaf7f96a38ee36b80168cd92eef0d3b9748caa478
(cherry picked from commit
54a10a0a97a1aa8138d116078146741ec59da6fd)
John Spurlock [Wed, 4 Jun 2014 23:11:22 +0000 (19:11 -0400)]
Settings: Battery saver settings sub-page.
New battery saver settings page, accessed via
the power usage settings overflow menu.
The settings page has a master switch to toggle
battery saver mode, feature disclosure text,
and a preference to configure the automatic
trigger level.
Remove developer checkbox now that this option
has a real home.
NO_SQ: multi project change
Bug:
13329308
Change-Id: Iac54238f3406439711b44a3c17f220ac5e370a37
Martijn Coenen [Tue, 10 Jun 2014 20:56:03 +0000 (20:56 +0000)]
Merge "Remove obsolete NFC unlock XML file."
Martijn Coenen [Tue, 10 Jun 2014 20:54:23 +0000 (13:54 -0700)]
Remove obsolete NFC unlock XML file.
NFC unlock was moved to TrustAgent.
Change-Id: Iaf7f96a38ee36b80168cd92eef0d3b9748caa478
Alan Viverette [Tue, 10 Jun 2014 20:41:07 +0000 (13:41 -0700)]
Remove all dialog icons in Settings
BUG:
15474733
Change-Id: I43ab10a3bbcabdac6109abf80266f1c4b52bf6fb
Alan Viverette [Tue, 10 Jun 2014 20:14:40 +0000 (20:14 +0000)]
Merge "Ripple tint is now color" into lmp-preview-dev
Baligh Uddin [Tue, 10 Jun 2014 19:49:12 +0000 (19:49 +0000)]
Merge "Breaks the build. Issue being tracked in b/
15538481" into lmp-preview-dev
Baligh Uddin [Tue, 10 Jun 2014 19:49:04 +0000 (19:49 +0000)]
Breaks the build.
Issue being tracked in b/
15538481
Revert "Import translations. DO NOT MERGE"
This reverts commit
b9e06ceb16ce7c8d142db0d68c6a3e24a6e844ed.
Change-Id: I9161a3290a8488d0d896d6dbb41d367317694269
Fabrice Di Meglio [Tue, 10 Jun 2014 19:12:53 +0000 (19:12 +0000)]
Merge "Replace ic_settings_language.png asset to the new one" into lmp-preview-dev
Fabrice Di Meglio [Tue, 10 Jun 2014 19:10:42 +0000 (12:10 -0700)]
Replace ic_settings_language.png asset to the new one
See bug:
15523731 Please replace ic_settings_language.png to new one
Change-Id: I1455396ba91f3d519dd42df5b6ea2095ec20f42f
Baligh Uddin [Tue, 10 Jun 2014 18:02:19 +0000 (18:02 +0000)]
Merge "Fix Build break, will address in parallel."
Baligh Uddin [Tue, 10 Jun 2014 18:02:13 +0000 (18:02 +0000)]
Fix Build break, will address in parallel.
Revert "Import translations. DO NOT MERGE"
This reverts commit
b2ceea95f29e383e512f916a66e03439f6cfcf54.
Change-Id: Ie92030c9c3bdde0b7dffd1382e2393126688ce4e
Fabrice Di Meglio [Tue, 10 Jun 2014 17:22:14 +0000 (17:22 +0000)]
am
2eae7a40: Merge "Update Sync status icon" into lmp-preview-dev
* commit '
2eae7a40229b132bed632df0879e4056a7c5a107':
Update Sync status icon
Fabrice Di Meglio [Tue, 10 Jun 2014 17:22:02 +0000 (17:22 +0000)]
am
f54b6031: Merge "Update assets for "NFC & more"" into lmp-preview-dev
* commit '
f54b603156c042031af74e3ad73b55b75f058a09':
Update assets for "NFC & more"
Fabrice Di Meglio [Tue, 10 Jun 2014 17:21:54 +0000 (17:21 +0000)]
am
195ee660: Merge "Update Recents Search assets" into lmp-preview-dev
* commit '
195ee66013b990f8da06a030fb4889e50d1eeacf':
Update Recents Search assets
Fabrice Di Meglio [Tue, 10 Jun 2014 17:21:34 +0000 (17:21 +0000)]
am
a13e40f4: Merge "Add icon for Search Recents" into lmp-preview-dev
* commit '
a13e40f4ce6c9435ba4d014319c371bfa96f252e':
Add icon for Search Recents
Baligh Uddin [Tue, 10 Jun 2014 17:11:22 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 10 Jun 2014 17:11:19 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
Adrian Roos [Tue, 10 Jun 2014 15:16:56 +0000 (15:16 +0000)]
Merge "Fix master build"