Kenny Root
fc783b06cd
am 56e75f3c
: am 645e78d8
: Merge "Allow multiuser use of keystore" into jb-mr2-dev
...
* commit '56e75f3c170f859ecd05b43ca5e3a14ac7878cf7':
Allow multiuser use of keystore
2013-04-08 11:07:37 -07:00
Kenny Root
56e75f3c17
am 645e78d8
: Merge "Allow multiuser use of keystore" into jb-mr2-dev
...
* commit '645e78d8063169fa59b69bdc83ac5a62840d3253':
Allow multiuser use of keystore
2013-04-08 11:04:10 -07:00
Kenny Root
645e78d806
Merge "Allow multiuser use of keystore" into jb-mr2-dev
2013-04-08 17:58:37 +00:00
Kenny Root
c5550c2012
Allow multiuser use of keystore
...
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.
(cherry picked from commit cc48b0104e
)
Bug: 7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175
2013-04-08 10:36:05 -07:00
Kenny Root
3a27171881
Merge "Allow multiuser use of keystore"
2013-04-08 17:34:32 +00:00
Kenny Root
cc48b0104e
Allow multiuser use of keystore
...
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.
Bug: 7249554
Change-Id: I5aa069ca439cea68e87e141c497be8cd86b0ba9d
2013-04-08 10:23:38 -07:00
Daniel Sandler
2fb4c37260
am afa0b2c5
: am b8c4898c
: Fix "no notification listeners" text.
...
* commit 'afa0b2c5a884107d135c868bb6a0659990051005':
Fix "no notification listeners" text.
2013-04-08 09:15:46 -07:00
Daniel Sandler
afa0b2c5a8
am b8c4898c
: Fix "no notification listeners" text.
...
* commit 'b8c4898c64c6e1a0e3d0a1de7c0116d80edb6e44':
Fix "no notification listeners" text.
2013-04-08 09:12:38 -07:00
Daniel Sandler
b8c4898c64
Fix "no notification listeners" text.
...
Bug: 8454150
Change-Id: I6b02367e2be9f31fdf0a54d7fc0c49f8c82922d7
2013-04-08 12:01:33 -04:00
The Android Automerger
a10cbcf137
merge in master-release history after reset to master
2013-04-08 07:51:14 -07:00
The Android Automerger
2ecf44d6f8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:57:01 -07:00
Nick Kralevich
916676515b
am 4f9dc39a
: am b26a61d6
: InstalledAppDetails: allow revocable permission.
...
* commit '4f9dc39a8a7db18a5156a645fe761c11deb57d99':
InstalledAppDetails: allow revocable permission.
2013-04-07 10:59:01 -07:00
Nick Kralevich
4f9dc39a8a
am b26a61d6
: InstalledAppDetails: allow revocable permission.
...
* commit 'b26a61d6433e2e5456563e5d33aa4f419a8966fb':
InstalledAppDetails: allow revocable permission.
2013-04-07 10:56:54 -07:00
Nick Kralevich
b26a61d643
InstalledAppDetails: allow revocable permission.
...
Modify the Settings app so that a user can revoke permissions,
using the new API added in AppSecurityPermissions.
Bug: 8332307
Change-Id: I4d6c10877e2c3cc284dbf9a43f79697914c0b192
2013-04-05 18:39:15 -07:00
Daniel Sandler
8f511b1709
Notification listeners can be enabled in Settings>Security.
...
Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS.
Bug: 8454150
Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
2013-04-05 15:38:08 -07:00
Daniel Sandler
865bdb2838
Reference new StatusBarNotification and INotificationListener packages.
...
Requires change I1be46f82 in f/b.
Bug: 8199624
Change-Id: I2ebf7fde793dd932c5fadb308f8a0b93e18d9afa
2013-04-05 15:37:55 -07:00
Daniel Sandler
225be3ce37
am 3c3a3b7e
: am 79b9bfe5
: Notification listeners can be enabled in Settings>Security.
...
* commit '3c3a3b7eb0b7d8df49d823aa74de2e868f0e189b':
Notification listeners can be enabled in Settings>Security.
2013-04-05 13:02:25 -07:00
Daniel Sandler
8646ab979f
am 861b2242
: am e44f5e2b
: Reference new StatusBarNotification and INotificationListener packages.
...
* commit '861b224281f60fffb171a7dd297328efbe09fc9b':
Reference new StatusBarNotification and INotificationListener packages.
2013-04-05 13:02:25 -07:00
Daniel Sandler
3c3a3b7eb0
am 79b9bfe5
: Notification listeners can be enabled in Settings>Security.
...
* commit '79b9bfe56ee4036fbe8d9bcac01260356309ae2f':
Notification listeners can be enabled in Settings>Security.
2013-04-05 12:58:41 -07:00
Daniel Sandler
861b224281
am e44f5e2b
: Reference new StatusBarNotification and INotificationListener packages.
...
* commit 'e44f5e2bd6624f5df91e2676b1ef5e3ddf279066':
Reference new StatusBarNotification and INotificationListener packages.
2013-04-05 12:58:40 -07:00
Daniel Sandler
79b9bfe56e
Notification listeners can be enabled in Settings>Security.
...
Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS.
Bug: 8454150
Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
2013-04-05 19:57:03 +00:00
Daniel Sandler
e44f5e2bd6
Reference new StatusBarNotification and INotificationListener packages.
...
Requires change I1be46f82 in f/b.
Bug: 8199624
Change-Id: I2ebf7fde793dd932c5fadb308f8a0b93e18d9afa
2013-04-05 19:55:12 +00:00
Baligh Uddin
e4eac7a63b
am c1f6219f
: am 34e85f84
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'c1f6219f76d6fc4ab31c42fde224383888fa1307':
Import translations. DO NOT MERGE
2013-04-05 11:55:51 -07:00
Baligh Uddin
c1f6219f76
am 34e85f84
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '34e85f841cf1022a1e709cc6288c68267d358e0b':
Import translations. DO NOT MERGE
2013-04-05 11:53:35 -07:00
Baligh Uddin
3b79b5b2d2
Merge "Import translations. DO NOT MERGE"
2013-04-05 18:48:35 +00:00
Baligh Uddin
34e85f841c
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-05 18:48:15 +00:00
Baligh Uddin
ce64877469
Import translations. DO NOT MERGE
...
Change-Id: I841d6ddb3797a3a84dc53f5139351232e6a6a5da
Auto-generated-cl: translation import
2013-04-05 11:10:03 -07:00
Baligh Uddin
92be13df55
Import translations. DO NOT MERGE
...
Change-Id: Ide4cc0e303747966dd29a5c849a2d9023b92e098
Auto-generated-cl: translation import
2013-04-05 11:07:06 -07:00
Kristian Monsen
704793f374
am 3c6c45f9
: am a95604de
: Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
...
* commit '3c6c45f931307af098e790e86b114c804655f42b':
Adding developer toggle for using Chromium WebView.
2013-04-05 10:51:22 -07:00
Kristian Monsen
3c6c45f931
am a95604de
: Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
...
* commit 'a95604de1acd89999c240449e926485393963455':
Adding developer toggle for using Chromium WebView.
2013-04-05 10:46:44 -07:00
Kristian Monsen
a95604de1a
Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
2013-04-05 17:41:34 +00:00
The Android Automerger
e943eb1ec7
merge in master-release history after reset to master
2013-04-05 07:50:00 -07:00
Fabrice Di Meglio
8a34360c25
am 66fe9882
: am e68959de
: Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
...
* commit '66fe98823f7b38387034ed3bfc9a90d629a5a980':
More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
2013-04-04 11:06:49 -07:00
Fabrice Di Meglio
66fe98823f
am e68959de
: Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
...
* commit 'e68959de3a7f2d47de4816b65262b10e03ef313c':
More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
2013-04-04 11:02:04 -07:00
Fabrice Di Meglio
e68959de3a
Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
2013-04-04 17:59:50 +00:00
The Android Automerger
41117fcd9a
merge in master-release history after reset to master
2013-04-04 07:50:33 -07:00
Baligh Uddin
8b7c71ea35
am 63627c20
: am 186e250a
: Import translations. DO NOT MERGE
...
* commit '63627c20bd4bbfb59ba4f3db1bf5948c76fa6038':
Import translations. DO NOT MERGE
2013-04-03 15:03:59 -07:00
Baligh Uddin
63627c20bd
am 186e250a
: Import translations. DO NOT MERGE
...
* commit '186e250ac7f74e8c724919184e949f7bf17afefb':
Import translations. DO NOT MERGE
2013-04-03 14:59:08 -07:00
Baligh Uddin
29366f48ec
Import translations. DO NOT MERGE
...
Change-Id: I3eddc5b7fbb017c3e3b4029a7cb93a87c9c11f06
Auto-generated-cl: translation import
2013-04-03 11:17:55 -07:00
Baligh Uddin
186e250ac7
Import translations. DO NOT MERGE
...
Change-Id: I5b8551dbf8daff54103023c68f8214b135dd07c1
Auto-generated-cl: translation import
2013-04-03 11:14:39 -07:00
The Android Automerger
eb892e2b67
merge in master-release history after reset to master
2013-04-03 07:50:16 -07:00
Fabrice Di Meglio
f2a9717b93
More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
...
- use setPaddingRelative() instead of setPadding()
- add missing android:textAlignment="viewStart"
Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8
2013-04-02 18:36:43 -07:00
Robert Greenwalt
c41346d5bd
am 456eadd9
: am 58f9cbd6
: Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
...
* commit '456eadd9feb4b570ba59c6cbbd43013484d31f62':
pre-provide the mvno data of the edited apn
2013-04-02 12:29:10 -07:00
Robert Greenwalt
456eadd9fe
am 58f9cbd6
: Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
...
* commit '58f9cbd6774741d7fffbddbd06f2c0bf1fdf2e66':
pre-provide the mvno data of the edited apn
2013-04-02 12:25:17 -07:00
Robert Greenwalt
58f9cbd677
Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
2013-04-02 19:20:13 +00:00
The Android Automerger
b72e9919c1
merge in master-release history after reset to master
2013-04-02 09:18:02 -07:00
Sungmin Choi
cd1cb16bad
pre-provide the mvno data of the edited apn
...
For mvno, user can add or edit mvno data field.
Pre-provide the mvno data of the edited apn when the user selects
one of the mvno types.
For example if user choose gid, populate the data field with the
current sim's gid1 data, or if user choose the SPN option, fill
in data with the current carrier string. If IMSI, fill in imsi data.
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
2013-04-01 16:44:15 -07:00
Baligh Uddin
ae411c7fac
am 0c4da3fa
: (-s ours) am 1c541aec
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '0c4da3fa97dc637571d8f0473bc1a1f5bade4fdb':
Import translations. DO NOT MERGE
2013-04-01 12:41:42 -07:00
Baligh Uddin
0c4da3fa97
am 1c541aec
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '1c541aec2be937f3ba6b1530551c16435d0eafc6':
Import translations. DO NOT MERGE
2013-04-01 12:39:36 -07:00
Baligh Uddin
1c541aec2b
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-01 19:37:24 +00:00