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
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
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
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
2015-02-03 21:31:56 +00:00
Amith Yamasani
47ba346e1e
Merge "set tapjacking protection for deviceadmin permission dialog"
...
automerge: 6317e06
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
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
2015-02-03 18:19:05 +00:00
Sanket Padawe
c1af278c9d
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
...
automerge: 4decadb
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
2015-02-03 16:04:37 +00:00
Andres Morales
4bd31b9ac6
am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
...
automerge: 98d8a49
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
Robin Lee
70dbf05d50
am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
...
automerge: d16231d
2015-02-02 11:45:57 +00:00
Zoltan Szatmary-Ban
2bfd97ede9
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
2015-02-02 11:43:18 +00:00
Robin Lee
d16231de24
am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
...
* commit '528c64e205bf1d8f8237fb4e582d152958345b92':
Repair broken keychain wifi_uid logic
2015-02-02 11:28:42 +00:00
Robin Lee
528c64e205
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
2015-02-02 11:22:02 +00:00
Sanket Padawe
53a46a3f58
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.
2015-01-30 21:19:33 +00:00
Sanket Padawe
55ebba9bed
Change to fit color name text on color selection spinner in settings. automerge: a46c723
...
automerge: f99df05
2015-01-30 19:58:41 +00:00
Sanket Padawe
f99df057ac
Change to fit color name text on color selection spinner in settings.
...
automerge: a46c723
2015-01-30 19:50:33 +00:00
Sanket Padawe
a46c7236b6
Change to fit color name text on color selection spinner in settings.
...
Bug: 19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
2015-01-30 11:23:22 -08:00
Robin Lee
635426b0a7
Repair broken keychain wifi_uid logic
...
Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.
Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
2015-01-30 19:00:45 +00:00
Stephan Huber
dc333212bd
set tapjacking protection for deviceadmin permission dialog
...
Second try to commit tapjacking protection for device administrator permission dialog.
Remplaced tap by spaces
Signed-off-by: Stephan Huber <huber.stephan.sit@gmail.com >
Change-Id: I8e14e713d1f039ca79f5006cdeb12b65652884fb
2015-01-30 14:38:10 +01:00
Sanket Padawe
6439357c10
am b33c8ad5: am ef72625b: am ab845180: Remove sim status and imei for secondary user.
...
* commit 'b33c8ad518796e7931cff157b06f791384d575d8':
Remove sim status and imei for secondary user.
2015-01-30 02:59:09 +00:00
Sanket Padawe
b33c8ad518
am ef72625b: am ab845180: Remove sim status and imei for secondary user.
...
* commit 'ef72625b5243f2afc6b63553ce57f439801d6977':
Remove sim status and imei for secondary user.
2015-01-30 02:52:06 +00:00
Sanket Padawe
ef72625b52
am ab845180: Remove sim status and imei for secondary user.
...
* commit 'ab84518009c53e28e021f27696cd4e51360fccbc':
Remove sim status and imei for secondary user.
2015-01-30 02:41:47 +00:00
Sanket Padawe
ab84518009
Remove sim status and imei for secondary user.
...
Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
2015-01-29 17:19:26 -08:00
