OSDN Git Service
Maurice Lam [Wed, 18 Feb 2015 19:38:07 +0000 (19:38 +0000)]
Merge "[WifiSettings] Use arrows for advanced options"
Maurice Lam [Thu, 12 Feb 2015 22:53:59 +0000 (14:53 -0800)]
[WifiSettings] Use arrows for advanced options
Use an arrow pointing up / down for advanced options instead of a
checkbox, making it more clear that it is merely hiding the options,
and not a setting in itself that others are dependent upon.
Bug:
18007635
Change-Id: Ie2f2cca708b661f76749bc4af5918275806af1a8
Alexandra Gherghina [Wed, 18 Feb 2015 16:44:24 +0000 (16:44 +0000)]
Merge "Clarify important part of longer string"
Geoff Mendal [Wed, 18 Feb 2015 14:56:56 +0000 (14:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 18 Feb 2015 14:54:11 +0000 (06:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e2f09268940b69cc1ca74d9c7a147f6d536232d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Feb 2015 14:20:12 +0000 (14:20 +0000)]
am
201e61a0: (-s ours) am
84725dfb: (-s ours) am
e991b546: (-s ours) Import translations. DO NOT MERGE
* commit '
201e61a0fe0590d41aabfb9044ff0fe66fa65299':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:14:03 +0000 (14:14 +0000)]
am
84725dfb: (-s ours) am
e991b546: (-s ours) Import translations. DO NOT MERGE
* commit '
84725dfb09399bde98c3541691cc330c46e4050d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:07:43 +0000 (14:07 +0000)]
am
e991b546: (-s ours) Import translations. DO NOT MERGE
* commit '
e991b5461fa67cc92ddcc4cd583a347550f43094':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 13:58:16 +0000 (13:58 +0000)]
am
fc45ee75: (-s ours) am
2594d2bf: (-s ours) Import translations. DO NOT MERGE
* commit '
fc45ee755ad0acd7418f006313c7939eb8b1fbe9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 13:56:15 +0000 (05:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I134f0a955ac0f56ae8b16dbcace0d2fd855025e5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Feb 2015 13:51:26 +0000 (13:51 +0000)]
am
2594d2bf: (-s ours) Import translations. DO NOT MERGE
* commit '
2594d2bf7af8ae0032be068da050535a67989a56':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 13:44:54 +0000 (05:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I01ad7807e5a92775a53c3c5074425987517b5f95
Auto-generated-cl: translation import
Alexandra Gherghina [Wed, 18 Feb 2015 10:36:20 +0000 (10:36 +0000)]
Clarify important part of longer string
Bug:
18353106
Change-Id: I24d797aab74ab1edf840022bf0736d291a922cb0
Geoff Mendal [Mon, 16 Feb 2015 15:13:51 +0000 (15:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Feb 2015 15:12:57 +0000 (07:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1c49c4b770a6c075beecfaba10bb73b961194af1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Feb 2015 14:36:50 +0000 (14:36 +0000)]
am
5198624c: (-s ours) am
ae87c907: (-s ours) Import translations. DO NOT MERGE
automerge:
4c54180 -s ours
* commit '
4c54180dc708780d8eb99e97b0f9f78b11de7242':
Geoff Mendal [Mon, 16 Feb 2015 14:33:12 +0000 (14:33 +0000)]
am
5198624c: (-s ours) am
ae87c907: (-s ours) Import translations. DO NOT MERGE
* commit '
5198624c2a4db659f0fea36ad6cbb66dc734d1e9':
Geoff Mendal [Mon, 16 Feb 2015 14:31:30 +0000 (14:31 +0000)]
Import translations. DO NOT MERGE automerge:
ae87c90 -s ours
automerge:
576a397 -s ours
* commit '
576a39710071bebb5a9c10e30a83246154e9e11d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 14:27:34 +0000 (14:27 +0000)]
am
ae87c907: (-s ours) Import translations. DO NOT MERGE
* commit '
ae87c9075e02466f842b0b7fe6a081c899ce954e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 14:26:27 +0000 (14:26 +0000)]
Import translations. DO NOT MERGE
automerge:
ae87c90 -s ours
* commit '
ae87c9075e02466f842b0b7fe6a081c899ce954e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 14:14:52 +0000 (06:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3870aad14e864485824f4a82c9b266e425c42da3
Auto-generated-cl: translation import
Dianne Hackborn [Fri, 13 Feb 2015 02:37:25 +0000 (18:37 -0800)]
Fix voice settings to not be broken. :(
It was setting the wrong recognizer activity, so when you
changed the voice interactor it would break the recognizer but
at least it would reset to the default interactor at boot and
not still be broken. :p
Change-Id: Icfec4f11526528b821e5fd67a6519bf5874ea133
Maurice Lam [Fri, 13 Feb 2015 01:07:12 +0000 (01:07 +0000)]
Merge "Setup lock screen go back one screen at a time"
Sanket Padawe [Fri, 13 Feb 2015 00:07:22 +0000 (00:07 +0000)]
am
4a7ca7d5: am
bdfdf07c: am
0362e870: am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
4a7ca7d5a7c83dc77921c9c32abc7b366c18b46c':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Fri, 13 Feb 2015 00:01:08 +0000 (00:01 +0000)]
am
bdfdf07c: am
0362e870: am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
bdfdf07ce3b788d2962f75027f6be615c9784e10':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 23:55:01 +0000 (23:55 +0000)]
am
0362e870: am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
0362e870b258b03ec06110d032b521cac3d37bf2':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 23:47:52 +0000 (23:47 +0000)]
am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
7e21fa5ab4f867263088a38ed279d889b902a05b':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 20:39:34 +0000 (12:39 -0800)]
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug:
19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
Geoff Mendal [Thu, 12 Feb 2015 19:31:44 +0000 (19:31 +0000)]
am
785bfe71: (-s ours) am
31010cc1: (-s ours) Import translations. DO NOT MERGE
* commit '
785bfe719c408b6b188ea23a8472eccf9fbd3532':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 19:20:43 +0000 (19:20 +0000)]
am
31010cc1: (-s ours) Import translations. DO NOT MERGE
* commit '
31010cc15530338fdcf4e1a66a47d29c6851cbc6':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 19:05:53 +0000 (11:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I130d234905731c2df5249e2c769c572bbb61f94e
Auto-generated-cl: translation import
Maurice Lam [Fri, 23 Jan 2015 02:35:11 +0000 (18:35 -0800)]
Setup lock screen go back one screen at a time
SetupChooseLockGeneric no longer finishes itself when it receives a
RESULT_CANCELED result from an activity it started.
Bug:
18631770
Change-Id: I892b76847904225fe607b9406d6e76f932daa062
Svet Ganov [Thu, 12 Feb 2015 03:43:33 +0000 (03:43 +0000)]
Merge "Removing the unused for years app shortcuts feature."
Alex Klyubin [Wed, 11 Feb 2015 19:58:03 +0000 (19:58 +0000)]
am
e029b91c: am
1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit '
e029b91c53323c27ea18a57c6af8c00ecab5576b':
Hidden ApplicationInfo flags are now in privateFlags.
Alex Klyubin [Wed, 11 Feb 2015 19:47:09 +0000 (19:47 +0000)]
am
1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit '
1d33bca0e496f980ec1a364f58cccd457d40954a':
Hidden ApplicationInfo flags are now in privateFlags.
Geoff Mendal [Wed, 11 Feb 2015 19:30:48 +0000 (19:30 +0000)]
am
d232a3fa: (-s ours) am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
automerge:
f513ca2 -s ours
* commit '
f513ca2fa187ffdd099272b12df932f89be4824c':
Alex Klyubin [Wed, 11 Feb 2015 19:27:24 +0000 (19:27 +0000)]
Merge "Hidden ApplicationInfo flags are now in privateFlags."
Geoff Mendal [Wed, 11 Feb 2015 19:20:15 +0000 (19:20 +0000)]
am
d232a3fa: (-s ours) am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '
d232a3fa5c86f19ccf559bf4dc649d39d3620ca3':
Alex Klyubin [Wed, 4 Feb 2015 16:47:12 +0000 (08:47 -0800)]
Hidden ApplicationInfo flags are now in privateFlags.
See
b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
Geoff Mendal [Wed, 11 Feb 2015 15:15:19 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Adrian Roos [Wed, 11 Feb 2015 15:11:41 +0000 (15:11 +0000)]
Merge "Remove obsolete WifiSettingsForSetupWizardXL"
Geoff Mendal [Wed, 11 Feb 2015 15:06:40 +0000 (07:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idf53b16beb75bcfd79390205701efe1548920e47
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Feb 2015 15:04:20 +0000 (15:04 +0000)]
Import translations. DO NOT MERGE automerge:
60d2ee8 -s ours
automerge:
96a90af -s ours
* commit '
96a90af83bddfec535bc4ebe96545145d0b33285':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 15:03:56 +0000 (15:03 +0000)]
am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '
60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 15:00:50 +0000 (15:00 +0000)]
Import translations. DO NOT MERGE
automerge:
60d2ee8 -s ours
* commit '
60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
Adrian Roos [Wed, 11 Feb 2015 14:54:45 +0000 (15:54 +0100)]
Remove obsolete WifiSettingsForSetupWizardXL
Bug:
18405549
Change-Id: I30c7c9ee8f544054b13cfc24f7433bdc1448e339
Geoff Mendal [Wed, 11 Feb 2015 14:50:09 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
Alan Viverette [Wed, 11 Feb 2015 00:42:36 +0000 (00:42 +0000)]
Merge "Replace data_usage_bar with progress background tint"
Dianne Hackborn [Tue, 10 Feb 2015 17:41:37 +0000 (17:41 +0000)]
Merge "Fix issue #
19272671: Context unclear or missing..."
Alan Viverette [Mon, 9 Feb 2015 22:06:17 +0000 (14:06 -0800)]
Replace data_usage_bar with progress background tint
Change-Id: Id9b0d3946f2182fb8f0e09d4891f864de99ba1c5
Dianne Hackborn [Mon, 9 Feb 2015 19:20:03 +0000 (11:20 -0800)]
Fix issue #
19272671: Context unclear or missing...
"USEDRAM of TOTALRAM used over TIME"
Change-Id: Ib0eecafe3c6f5bd1408adac584d6b5715e7a7d2f
Geoff Mendal [Mon, 9 Feb 2015 16:38:38 +0000 (16:38 +0000)]
am
278c81a6: (-s ours) am
37dfabff: (-s ours) am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
278c81a62611a0337786e892eb1c110093197cf7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:31:32 +0000 (16:31 +0000)]
am
37dfabff: (-s ours) am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
37dfabff82bd78d0956f41868579bdf5eb885078':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:07:10 +0000 (16:07 +0000)]
am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
713e794dac88e4e977faa95da88163db6a568e15':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Mon, 9 Feb 2015 15:03:00 +0000 (15:03 +0000)]
Merge "Make Settings > Security > Apps with Usage Access multiprofile aware"
Geoff Mendal [Mon, 9 Feb 2015 14:40:55 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I17e0fc29342180c113a3664822bf1c87617daed7
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Feb 2015 14:31:43 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Mon, 9 Feb 2015 13:13:37 +0000 (13:13 +0000)]
Merge "Eliminate duplicated code for creating circled user icons in Settings."
Zoltan Szatmary-Ban [Mon, 9 Feb 2015 13:06:57 +0000 (13:06 +0000)]
Merge "Remove frame and shadow from CircleFramedDrawable"
Zoltan Szatmary-Ban [Mon, 9 Feb 2015 12:53:31 +0000 (12:53 +0000)]
Merge "Eliminate duplicated code in Settings for category headers"
Dianne Hackborn [Sat, 7 Feb 2015 00:35:41 +0000 (16:35 -0800)]
Include home state in mem usage.
Change-Id: I7639e963386adf55a18139f395e7fc43277cc930
Svet Ganov [Thu, 5 Feb 2015 18:15:29 +0000 (10:15 -0800)]
Removing the unused for years app shortcuts feature.
The shortcuts feature has been commented out since 2011. Now the setings
provider no longer has a bookmarks table since the only party aside of this
commented out feature using it was the ShortcutManager. We moved to an
in memory model for the settings provider's state. We do not want to keep
there anything that is not used. Therefore, we moved from a bookmarks table
to a resource which renders this settings feature unusable. If we decide
to revive the shortcut feature we can revert this change and add support
for in memory bookmarks state in the settings provider.
Change-Id: Ib1871f940bc27029a5dd941b901d6087914a2231
Adrian Roos [Thu, 5 Feb 2015 19:20:48 +0000 (19:20 +0000)]
Merge "Ensure new credentails are valid"
James Cook [Thu, 5 Feb 2015 18:43:59 +0000 (18:43 +0000)]
Merge "Extend translation char limit for auto date and time zone"
James Cook [Wed, 4 Feb 2015 22:04:30 +0000 (14:04 -0800)]
Extend translation char limit for auto date and time zone
There's enough space for 30 chars and some languages (Polish) need
more space.
Bug:
19159289
Change-Id: Ib24eeaf33c2eb3150cf3938757cdfa3c755c2674
Jason Monk [Wed, 28 Jan 2015 15:35:53 +0000 (10:35 -0500)]
Move some wifi tracking code to SettingsLib
Move tracking of which networks are available/saved and their state
over to SettingsLib to share it with Quick Settings.
Bug:
19180466
Change-Id: Iaeef06b26da8cb38e1ba09a7d105d04d499dc181
Geoff Mendal [Wed, 4 Feb 2015 18:58:05 +0000 (18:58 +0000)]
am
2a9fef1a: (-s ours) Import translations. DO NOT MERGE automerge:
40e66bc -s ours
* commit '
2a9fef1ae71c2580741a8ac960a385e915622c17':
Import translations. DO NOT MERGE
Jason Monk [Tue, 13 Jan 2015 15:05:53 +0000 (10:05 -0500)]
Make Settings include new SettingsLib
Bug:
19180466
Change-Id: I1ab5f2ac2d5faa5640ebe6e08ba8071a02ac8308
Geoff Mendal [Wed, 4 Feb 2015 15:06:43 +0000 (07:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I679e2872bb5e2ce8ceba94d4da883db9bdbec5f4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Feb 2015 15:04:49 +0000 (15:04 +0000)]
Import translations. DO NOT MERGE
automerge:
40e66bc -s ours
* commit '
40e66bce6ceea1b2b9d49a26564665222eb32745':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Feb 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
Svetoslav [Wed, 4 Feb 2015 05:58:11 +0000 (21:58 -0800)]
Fix crash in print settings utils
Change-Id: I8000b674c0579988d6dfae2fcff136a06c721362
Amith Yamasani [Tue, 3 Feb 2015 21:31:56 +0000 (21:31 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog" automerge:
6317e06
automerge:
47ba346
* commit '
47ba346e1ea491f925ad47a4fa04b217bfcb4019':
set tapjacking protection for deviceadmin permission dialog
Amith Yamasani [Tue, 3 Feb 2015 21:29:19 +0000 (21:29 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
automerge:
6317e06
* commit '
6317e06635ed52a9d1c1aeb0439017418f57ad0f':
set tapjacking protection for deviceadmin permission dialog
Amith Yamasani [Tue, 3 Feb 2015 21:24:51 +0000 (21:24 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
Adrian Roos [Tue, 3 Feb 2015 18:58:19 +0000 (19:58 +0100)]
Ensure new credentails are valid
Follow-up to I6f369eb60f8f6bb1e33384cd06534c713ab52e79
Bug:
18931518
Change-Id: I311b255a034b0cec8fee70b0f4938e6ebb20d95e
Sanket Padawe [Tue, 3 Feb 2015 18:24:42 +0000 (18:24 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge:
4decadb automerge:
c1af278
automerge:
2493118
* commit '
2493118a3ca150bdb94d87dda17e7b3bd3940af7':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:19:05 +0000 (18:19 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge:
4decadb
automerge:
c1af278
* commit '
c1af278c9da7f355fd9da883efb88a3e4d0f3b19':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:14:03 +0000 (18:14 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
automerge:
4decadb
* commit '
4decadbc44b12cca8790b4d27ab9c29e34cb9909':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:10:47 +0000 (18:10 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
Dianne Hackborn [Tue, 3 Feb 2015 17:43:54 +0000 (17:43 +0000)]
Merge "Make proc stats UI app-centric instead of process-centric."
Andres Morales [Tue, 3 Feb 2015 16:04:37 +0000 (16:04 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter automerge:
98d8a49
automerge:
4bd31b9
* commit '
4bd31b9ac676a5d3c6943bc9f86f524eedad5bef':
Use getDefaultAdapter instead of getNfcAdapter
Andres Morales [Tue, 3 Feb 2015 16:01:45 +0000 (16:01 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter
automerge:
98d8a49
* commit '
98d8a490d5930c9f6179c8aefe792012c542ddbb':
Use getDefaultAdapter instead of getNfcAdapter
Andres Morales [Tue, 3 Feb 2015 15:53:17 +0000 (15:53 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter
* commit '
2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
Dianne Hackborn [Sat, 31 Jan 2015 02:19:38 +0000 (18:19 -0800)]
Make proc stats UI app-centric instead of process-centric.
The UI now shows a much simpler overview of memory use for
the current measured duration, computing the weighted RAM
user per application. (This is done basically by rolling up
each individual process into an app that can contain multiple
processes, and using the recently introduced weighted RAM for
all data processing.)
The details screen is updated to reflect this new design,
showing an overview of a particular application, which
separate entries for each process running for that app.
Change-Id: I47d79c30086d733eb37440a6c21b18a92b767d01
Sanket Padawe [Tue, 3 Feb 2015 00:46:55 +0000 (16:46 -0800)]
Remove SimDialogActivity from recents app list.
Bug:
19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
Andres Morales [Mon, 2 Feb 2015 17:35:14 +0000 (09:35 -0800)]
Use getDefaultAdapter instead of getNfcAdapter
getNfcAdapter can throw an exception if NFC is not
available
Bug:
19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
Geoff Mendal [Mon, 2 Feb 2015 15:36:59 +0000 (15:36 +0000)]
am
c202347d: (-s ours) am
0bb8ba32: (-s ours) Import translations. DO NOT MERGE
* commit '
c202347d6ec25a525ac51707461b903d7061270d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 15:30:26 +0000 (15:30 +0000)]
am
0bb8ba32: (-s ours) Import translations. DO NOT MERGE
* commit '
0bb8ba322e0bed9d988e14888079c5d6283cfacc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 15:09:27 +0000 (07:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I879cccfc5c07605392d8db79212f1e12e8f261a3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 2 Feb 2015 14:52:47 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import
Robin Lee [Mon, 2 Feb 2015 11:51:53 +0000 (11:51 +0000)]
am
70dbf05d: am
528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev automerge:
d16231d
* commit '
70dbf05d50f29685f0754a35c96fe2b041b5ac2f':
Repair broken keychain wifi_uid logic
Robin Lee [Mon, 2 Feb 2015 11:45:57 +0000 (11:45 +0000)]
am
528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
automerge:
d16231d
* commit '
d16231de248aeb5aeccb8f4aa226a2f1b34cc082':
Repair broken keychain wifi_uid logic
Zoltan Szatmary-Ban [Wed, 28 Jan 2015 16:45:06 +0000 (16:45 +0000)]
Make Settings > Security > Apps with Usage Access multiprofile aware
Show badged apps with usage access together with non-badged ones.
Bug:
19157660
Change-Id: Ia294719678d5581c49b1fae3836a0b585ca5c140
Robin Lee [Mon, 2 Feb 2015 11:28:42 +0000 (11:28 +0000)]
am
528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
* commit '
528c64e205bf1d8f8237fb4e582d152958345b92':
Repair broken keychain wifi_uid logic
Robin Lee [Mon, 2 Feb 2015 11:22:01 +0000 (11:22 +0000)]
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
Sanket Padawe [Fri, 30 Jan 2015 21:19:33 +0000 (21:19 +0000)]
am
55ebba9b: Change to fit color name text on color selection spinner in settings. automerge:
a46c723 automerge:
f99df05
* commit '
55ebba9bedcfec79586426ccebda55b5b7af45f9':
Change to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:58:41 +0000 (19:58 +0000)]
Change to fit color name text on color selection spinner in settings. automerge:
a46c723
automerge:
f99df05
* commit '
f99df057acb077e7601ec11d27be1bca0265247b':
Change to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:50:33 +0000 (19:50 +0000)]
Change to fit color name text on color selection spinner in settings.
automerge:
a46c723
* commit '
a46c7236b6d71c861b49d20dd7515a9031764909':
Change to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:23:22 +0000 (11:23 -0800)]
Change to fit color name text on color selection spinner in settings.
Bug:
19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
OSDN Git Service
