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
James Cook
26b362b00d
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
2015-02-04 14:05:20 -08:00
Jason Monk
fc1b00cfe4
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
2015-02-04 20:40:32 +00:00
Geoff Mendal
544714d0ea
am 2a9fef1a
: (-s ours) Import translations. DO NOT MERGE automerge: 40e66bc
-s ours
...
* commit '2a9fef1ae71c2580741a8ac960a385e915622c17':
Import translations. DO NOT MERGE
2015-02-04 18:58:05 +00:00
Jason Monk
f15248bdb5
Make Settings include new SettingsLib
...
Bug: 19180466
Change-Id: I1ab5f2ac2d5faa5640ebe6e08ba8071a02ac8308
2015-02-04 15:35:05 +00:00
Geoff Mendal
55d34a3f69
Import translations. DO NOT MERGE
...
Change-Id: I679e2872bb5e2ce8ceba94d4da883db9bdbec5f4
Auto-generated-cl: translation import
2015-02-04 07:06:43 -08:00
Geoff Mendal
2a9fef1ae7
Import translations. DO NOT MERGE
...
automerge: 40e66bc
-s ours
* commit '40e66bce6ceea1b2b9d49a26564665222eb32745':
Import translations. DO NOT MERGE
2015-02-04 15:04:49 +00:00
Geoff Mendal
40e66bce6c
Import translations. DO NOT MERGE
...
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
2015-02-04 06:50:08 -08:00
Svetoslav
b428346fd3
Fix crash in print settings utils
...
Change-Id: I8000b674c0579988d6dfae2fcff136a06c721362
2015-02-03 21:58:11 -08:00
Amith Yamasani
29c99f1534
Merge "set tapjacking protection for deviceadmin permission dialog" automerge: 6317e06
...
automerge: 47ba346
* commit '47ba346e1ea491f925ad47a4fa04b217bfcb4019':
set tapjacking protection for deviceadmin permission dialog
2015-02-03 21:31:56 +00:00
Amith Yamasani
47ba346e1e
Merge "set tapjacking protection for deviceadmin permission dialog"
...
automerge: 6317e06
* commit '6317e06635ed52a9d1c1aeb0439017418f57ad0f':
set tapjacking protection for deviceadmin permission dialog
2015-02-03 21:29:19 +00:00
Amith Yamasani
6317e06635
Merge "set tapjacking protection for deviceadmin permission dialog"
2015-02-03 21:24:51 +00:00
Adrian Roos
4c00a61183
Ensure new credentails are valid
...
Follow-up to I6f369eb60f8f6bb1e33384cd06534c713ab52e79
Bug: 18931518
Change-Id: I311b255a034b0cec8fee70b0f4938e6ebb20d95e
2015-02-03 19:58:19 +01:00
Sanket Padawe
907990dbc5
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.
2015-02-03 18:24:42 +00:00
Sanket Padawe
2493118a3c
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge: 4decadb
...
automerge: c1af278
* commit 'c1af278c9da7f355fd9da883efb88a3e4d0f3b19':
Remove SimDialogActivity from recents app list.
2015-02-03 18:19:05 +00:00
Sanket Padawe
c1af278c9d
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
...
automerge: 4decadb
* commit '4decadbc44b12cca8790b4d27ab9c29e34cb9909':
Remove SimDialogActivity from recents app list.
2015-02-03 18:14:03 +00:00
Sanket Padawe
4decadbc44
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
2015-02-03 18:10:47 +00:00
Dianne Hackborn
1836796559
Merge "Make proc stats UI app-centric instead of process-centric."
2015-02-03 17:43:54 +00:00
Andres Morales
c91676e6d9
am 2e75203a
: Use getDefaultAdapter instead of getNfcAdapter automerge: 98d8a49
...
automerge: 4bd31b9
* commit '4bd31b9ac676a5d3c6943bc9f86f524eedad5bef':
Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 16:04:37 +00:00
Andres Morales
4bd31b9ac6
am 2e75203a
: Use getDefaultAdapter instead of getNfcAdapter
...
automerge: 98d8a49
* commit '98d8a490d5930c9f6179c8aefe792012c542ddbb':
Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 16:01:45 +00:00
Andres Morales
98d8a490d5
am 2e75203a
: Use getDefaultAdapter instead of getNfcAdapter
...
* commit '2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 15:53:17 +00:00
Dianne Hackborn
b94079a704
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
2015-02-02 18:03:40 -08:00
Sanket Padawe
ffd96559e7
Remove SimDialogActivity from recents app list.
...
Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
2015-02-02 16:46:55 -08:00
Andres Morales
2e75203a6e
Use getDefaultAdapter instead of getNfcAdapter
...
getNfcAdapter can throw an exception if NFC is not
available
Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
2015-02-02 13:39:57 -08:00
Geoff Mendal
7221a6bcaa
am c202347d
: (-s ours) am 0bb8ba32
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c202347d6ec25a525ac51707461b903d7061270d':
Import translations. DO NOT MERGE
2015-02-02 15:36:59 +00:00
Geoff Mendal
c202347d6e
am 0bb8ba32
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0bb8ba322e0bed9d988e14888079c5d6283cfacc':
Import translations. DO NOT MERGE
2015-02-02 15:30:26 +00:00
Geoff Mendal
233183439f
Import translations. DO NOT MERGE
...
Change-Id: I879cccfc5c07605392d8db79212f1e12e8f261a3
Auto-generated-cl: translation import
2015-02-02 07:09:27 -08:00
Geoff Mendal
0bb8ba322e
Import translations. DO NOT MERGE
...
Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import
2015-02-02 06:52:47 -08:00
Robin Lee
0b88b75aaf
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
2015-02-02 11:51:53 +00:00