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
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
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
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
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
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
2015-02-11 15:00:50 +00: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
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
Geoff Mendal
713e794dac
Import translations. DO NOT MERGE
...
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
2015-02-09 06:31: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
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
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
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
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
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
0bb8ba322e
Import translations. DO NOT MERGE
...
Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import
2015-02-02 06:52:47 -08: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
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
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
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
Fyodor Kupolov
922e602b3a
am b749c336: am c4dba451: am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
...
* commit 'b749c3368c0bd40a84026b44189e9119a0a27d15':
2015-01-29 20:56:45 +00:00
Fyodor Kupolov
b749c3368c
am c4dba451: am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
...
* commit 'c4dba4513b22a59911bfee358c6537f53bbb89a7':
2015-01-29 20:51:32 +00:00
Fyodor Kupolov
c4dba4513b
am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
...
* commit 'b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e':
2015-01-29 20:46:13 +00:00
Fyodor Kupolov
b26bec1a6f
am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1
...
* commit '83930bc3ee26001e18a3f708e05c0e967e21e559':
2015-01-29 20:39:11 +00:00
Fyodor Kupolov
83930bc3ee
am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59
...
automerge: 5b2b7e1
2015-01-29 20:34:29 +00:00
Fyodor Kupolov
d5363a1e3c
am 32f0525c: am ac840cd9: am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
...
* commit '32f0525c78a0777f4811d564b8990214fb157c0c':
2015-01-29 19:56:48 +00:00
Fyodor Kupolov
32f0525c78
am ac840cd9: am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
...
* commit 'ac840cd91b77c0a37723723a9d6101beec53bcd1':
2015-01-29 19:51:01 +00:00
Fyodor Kupolov
ac840cd91b
am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
...
* commit 'f400051c3a6476154adf185399cb2ad8b2b16657':
2015-01-29 19:42:06 +00:00
Fyodor Kupolov
5b2b7e1897
am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
...
automerge: 3a3ff59
2015-01-29 19:39:59 +00:00
Fyodor Kupolov
f400051c3a
am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae
...
* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
2015-01-29 19:35:11 +00:00
