Geoff Mendal
4c54180dc7
am 5198624c
: (-s ours) am ae87c907
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5198624c2a4db659f0fea36ad6cbb66dc734d1e9':
2015-02-16 14:33:12 +00:00
Geoff Mendal
38819187de
Import translations. DO NOT MERGE automerge: ae87c90
-s ours
...
automerge: 576a397
-s ours
* commit '576a39710071bebb5a9c10e30a83246154e9e11d':
Import translations. DO NOT MERGE
2015-02-16 14:31:30 +00:00
Geoff Mendal
5198624c2a
am ae87c907
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ae87c9075e02466f842b0b7fe6a081c899ce954e':
Import translations. DO NOT MERGE
2015-02-16 14:27:34 +00:00
Geoff Mendal
576a397100
Import translations. DO NOT MERGE
...
automerge: ae87c90
-s ours
* commit 'ae87c9075e02466f842b0b7fe6a081c899ce954e':
Import translations. DO NOT MERGE
2015-02-16 14:26:27 +00:00
Geoff Mendal
ae87c9075e
Import translations. DO NOT MERGE
...
Change-Id: I3870aad14e864485824f4a82c9b266e425c42da3
Auto-generated-cl: translation import
2015-02-16 06:14:52 -08:00
Dianne Hackborn
c5df5ddef0
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
2015-02-13 10:06:52 -08:00
Maurice Lam
3dd090d916
Merge "Setup lock screen go back one screen at a time"
2015-02-13 01:07:13 +00:00
Sanket Padawe
62197c9a97
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.
2015-02-13 00:07:22 +00:00
Sanket Padawe
4a7ca7d5a7
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.
2015-02-13 00:01:08 +00:00
Sanket Padawe
bdfdf07ce3
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.
2015-02-12 23:55:01 +00:00
Sanket Padawe
24401dfea0
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.
2015-02-12 23:50:02 +00:00
Sanket Padawe
0362e870b2
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.
2015-02-12 23:47:52 +00:00
Sanket Padawe
7e21fa5ab4
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
...
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
2015-02-12 12:39:34 -08:00
Geoff Mendal
6fc2f7f65d
am 785bfe71
: (-s ours) am 31010cc1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '785bfe719c408b6b188ea23a8472eccf9fbd3532':
Import translations. DO NOT MERGE
2015-02-12 19:31:44 +00:00
Geoff Mendal
785bfe719c
am 31010cc1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '31010cc15530338fdcf4e1a66a47d29c6851cbc6':
Import translations. DO NOT MERGE
2015-02-12 19:20:43 +00:00
Geoff Mendal
31010cc155
Import translations. DO NOT MERGE
...
Change-Id: I130d234905731c2df5249e2c769c572bbb61f94e
Auto-generated-cl: translation import
2015-02-12 11:05:53 -08:00
Maurice Lam
9066a5c8b3
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
2015-02-12 10:52:20 -08:00
Jason Monk
4896c01729
Move some Tethering code to SettingsLib to share
...
Change-Id: I43a356f2a14af4a15d1827919c39bbd1a04d3a94
2015-02-12 10:33:40 -05:00
Svet Ganov
2cd8c28027
Merge "Removing the unused for years app shortcuts feature."
2015-02-12 03:43:35 +00:00
Alex Klyubin
053f83d470
am e029b91c
: am 1d33bca0
: Merge "Hidden ApplicationInfo flags are now in privateFlags."
...
* commit 'e029b91c53323c27ea18a57c6af8c00ecab5576b':
Hidden ApplicationInfo flags are now in privateFlags.
2015-02-11 19:58:03 +00:00
Alex Klyubin
e029b91c53
am 1d33bca0
: Merge "Hidden ApplicationInfo flags are now in privateFlags."
...
* commit '1d33bca0e496f980ec1a364f58cccd457d40954a':
Hidden ApplicationInfo flags are now in privateFlags.
2015-02-11 19:47:09 +00:00
Geoff Mendal
629b4f8853
am d232a3fa
: (-s ours) am 60d2ee87
: (-s ours) Import translations. DO NOT MERGE
...
automerge: f513ca2
-s ours
* commit 'f513ca2fa187ffdd099272b12df932f89be4824c':
2015-02-11 19:30:48 +00:00
Alex Klyubin
1d33bca0e4
Merge "Hidden ApplicationInfo flags are now in privateFlags."
2015-02-11 19:27:25 +00:00
Geoff Mendal
f513ca2fa1
am d232a3fa
: (-s ours) am 60d2ee87
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd232a3fa5c86f19ccf559bf4dc649d39d3620ca3':
2015-02-11 19:20:15 +00:00
Alex Klyubin
cc254f4da9
Hidden ApplicationInfo flags are now in privateFlags.
...
See b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
2015-02-11 11:10:12 -08:00
Geoff Mendal
1f8b460215
Merge "Import translations. DO NOT MERGE"
2015-02-11 15:15:20 +00:00
Adrian Roos
341758a61e
Merge "Remove obsolete WifiSettingsForSetupWizardXL"
2015-02-11 15:11:42 +00:00
Geoff Mendal
d535fcb1c6
Import translations. DO NOT MERGE
...
Change-Id: Idf53b16beb75bcfd79390205701efe1548920e47
Auto-generated-cl: translation import
2015-02-11 07:06:40 -08:00
Geoff Mendal
36be61cb14
Import translations. DO NOT MERGE automerge: 60d2ee8
-s ours
...
automerge: 96a90af
-s ours
* commit '96a90af83bddfec535bc4ebe96545145d0b33285':
Import translations. DO NOT MERGE
2015-02-11 15:04:20 +00:00
Geoff Mendal
d232a3fa5c
am 60d2ee87
: (-s ours) Import translations. DO NOT MERGE
...
* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
2015-02-11 15:03:56 +00:00
Geoff Mendal
96a90af83b
Import translations. DO NOT MERGE
...
automerge: 60d2ee8
-s ours
* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
2015-02-11 15:00:50 +00:00
Adrian Roos
8481d64e32
Remove obsolete WifiSettingsForSetupWizardXL
...
Bug: 18405549
Change-Id: I30c7c9ee8f544054b13cfc24f7433bdc1448e339
2015-02-11 15:54:45 +01:00
Geoff Mendal
60d2ee8788
Import translations. DO NOT MERGE
...
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
2015-02-11 06:50:09 -08:00
Alan Viverette
172e76600f
Merge "Replace data_usage_bar with progress background tint"
2015-02-11 00:42:38 +00:00
Dianne Hackborn
1f2feca205
Merge "Fix issue #19272671 : Context unclear or missing..."
2015-02-10 17:41:38 +00:00
Alan Viverette
9c3d6909e7
Replace data_usage_bar with progress background tint
...
Change-Id: Id9b0d3946f2182fb8f0e09d4891f864de99ba1c5
2015-02-09 14:06:17 -08:00
Dianne Hackborn
7e3437c5d0
Fix issue #19272671 : Context unclear or missing...
...
"USEDRAM of TOTALRAM used over TIME"
Change-Id: Ib0eecafe3c6f5bd1408adac584d6b5715e7a7d2f
2015-02-09 11:20:03 -08:00
Geoff Mendal
98e67d287a
am 278c81a6
: (-s ours) am 37dfabff
: (-s ours) am 713e794d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '278c81a62611a0337786e892eb1c110093197cf7':
Import translations. DO NOT MERGE
2015-02-09 16:38:38 +00:00
Geoff Mendal
278c81a626
am 37dfabff
: (-s ours) am 713e794d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '37dfabff82bd78d0956f41868579bdf5eb885078':
Import translations. DO NOT MERGE
2015-02-09 16:31:32 +00:00
Geoff Mendal
37dfabff82
am 713e794d
: (-s ours) Import translations. DO NOT MERGE
...
* commit '713e794dac88e4e977faa95da88163db6a568e15':
Import translations. DO NOT MERGE
2015-02-09 16:07:10 +00:00
Zoltan Szatmary-Ban
10045bc2f1
Merge "Make Settings > Security > Apps with Usage Access multiprofile aware"
2015-02-09 15:03:00 +00:00
Geoff Mendal
ef4d788a70
Import translations. DO NOT MERGE
...
Change-Id: I17e0fc29342180c113a3664822bf1c87617daed7
Auto-generated-cl: translation import
2015-02-09 06:40:55 -08:00
Geoff Mendal
713e794dac
Import translations. DO NOT MERGE
...
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
2015-02-09 06:31:43 -08:00
Zoltan Szatmary-Ban
273a6e7ffd
Merge "Eliminate duplicated code for creating circled user icons in Settings."
2015-02-09 13:13:38 +00:00
Zoltan Szatmary-Ban
2e18bd9dbc
Merge "Remove frame and shadow from CircleFramedDrawable"
2015-02-09 13:06:57 +00:00
Zoltan Szatmary-Ban
2c228d8d7a
Merge "Eliminate duplicated code in Settings for category headers"
2015-02-09 12:53:32 +00:00
Dianne Hackborn
324bd766ee
Include home state in mem usage.
...
Change-Id: I7639e963386adf55a18139f395e7fc43277cc930
2015-02-06 16:35:41 -08:00
Svet Ganov
bbb3efe373
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
2015-02-05 14:11:37 -08:00
Adrian Roos
ec9286eac9
Merge "Ensure new credentails are valid"
2015-02-05 19:20:49 +00:00
James Cook
b8331548d1
Merge "Extend translation char limit for auto date and time zone"
2015-02-05 18:43:59 +00:00