Wei Liu
027373644a
am 94f06154: am 6bf67ef1: am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
...
* commit '94f06154012b57650aa79af9210fc73311333601':
Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.
2014-10-07 23:11:42 +00:00
Wei Liu
751160397d
Keep the BugreportWarningActivity screen on.
...
Make the bugreport warning text scrollable.
Bug: 16930717
Change-Id: I270ee3f3acdcdab2febc2a2768382bbfb20c438b
2014-10-07 15:39:09 -07:00
Wei Liu
38f4d48288
am a84130d3: am de93b104: am a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
...
* commit 'a84130d3e45ad1ac4cb5843adc027d463c3c304d':
Hide bug report notification in Android Framework from watches.
2014-10-07 00:05:56 +00:00
Wei Liu
a940f8656d
Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
2014-10-06 22:10:33 +00:00
Wei Liu
e255e4e536
Hide bug report notification in Android Framework from watches.
...
Bug: 17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
2014-10-06 14:50:10 -07:00
Dianne Hackborn
8b718b80e0
am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:39:50 +00:00
Dianne Hackborn
90d557b7a6
am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:17:10 +00:00
Dianne Hackborn
2d7576b082
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
...
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.
Add a new REAL_GET_TASKS that is the actual permission now.
Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.
Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
2014-10-03 16:26:04 -07:00
Baligh Uddin
ed5305d356
Import translations. DO NOT MERGE
...
Change-Id: Ic0b039cdceaa31724c9bd1723a0c0c83da468140
Auto-generated-cl: translation import
2014-09-28 20:24:06 -07:00
Esteban Talavera
ebd7a69ac0
am 3cba4cbb: am 9e2a2fd9: am 86d5c6aa: am 95f023d0: Merge "Set device admin on dpm set-device-owner command" into lmp-dev
...
* commit '3cba4cbb40ac0638a8118c130c1979e4654d54f4':
Set device admin on dpm set-device-owner command
2014-09-16 21:04:06 +00:00
Esteban Talavera
841e0ddeee
am 95f023d0: Merge "Set device admin on dpm set-device-owner command" into lmp-dev
...
* commit '95f023d018f51bb13a462a5b1f43cd9d6be0cde5':
Set device admin on dpm set-device-owner command
2014-09-15 19:28:37 +00:00
Esteban Talavera
9c17388cff
Set device admin on dpm set-device-owner command
...
Bug: 17312478
Change-Id: I4ef730a97d603352eda77f04a2b00fa97c2be662
2014-09-15 11:42:34 +01:00
Baligh Uddin
3e8ce3bb33
Import translations. DO NOT MERGE
...
Change-Id: Idb536e9edfaee903119b8d84188d013e045f5fba
Auto-generated-cl: translation import
2014-09-14 19:12:57 -07:00
Baligh Uddin
28ff7d715c
Import translations. DO NOT MERGE
...
Change-Id: If7ded66957dff5714f58db7fbf5fc6bdcaa37040
Auto-generated-cl: translation import
2014-08-24 09:23:19 -07:00
Selim Cinek
60ea8ac991
am cc19946d: Added notification color to all system notifications
...
* commit 'cc19946d947cf553ee9fd23778a3c811c18ae633':
Added notification color to all system notifications
2014-08-20 13:44:39 +00:00
Selim Cinek
255dd04271
Added notification color to all system notifications
...
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
2014-08-20 14:25:18 +02:00
Adam Lesinski
6e6bc85c1c
am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev
...
* commit '960ab6de31ddd1a92e7a2e1829a2f2cd9b209c13':
Add Shell command to set AppOps permissions
2014-08-19 20:55:05 +00:00
Adam Lesinski
b5cf61be7c
Add Shell command to set AppOps permissions
...
Change-Id: I6446543b27f0d2d2e69590a2807e713c6d5ccbbc
2014-08-19 11:27:19 -07:00
Baligh Uddin
c9c3a9c9db
Import translations. DO NOT MERGE
...
Change-Id: I0495a69db49b3475537a3546bcb4d246b4dd018b
Auto-generated-cl: translation import
2014-07-28 23:12:12 +00:00
Svet Ganov
be19c3a91a
Adding shell commands for grant/revoke of bind app widget permisison.
...
Testing the app widget APIs requires binding of widgets which is guarded
by a system signature permission or white listing. Since CTS tests can
not be signed with the platform certificate, they should be able to
temporariliy white list their package. This command adds the ability to
grant and revoke the provilege to bind app widgets to a given package.
Change-Id: I6de1bbf27ac684ec47e61157f19ec6d29e2db979
2014-07-23 02:25:25 +00:00
Baligh Uddin
9666f97dff
Import translations. DO NOT MERGE
...
Change-Id: I2808fa9de557f81f25e19b14b8db854516c759a4
Auto-generated-cl: translation import
2014-07-22 16:39:54 +00:00
Baligh Uddin
a17d1d2733
Import translations. DO NOT MERGE
...
Change-Id: I73983e44eec615f929d27351032fd1d532ee68a1
Auto-generated-cl: translation import
2014-07-20 12:03:51 -07:00
Baligh Uddin
802603572c
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
2014-07-17 19:13:40 +00:00
Baligh Uddin
50af6d7ae6
Remove deprecated locales - DO NOT MERGE
...
Change-Id: Iac5489639edae2373ed0ce92f7d0fe22629a249a
2014-07-19 13:05:12 -07:00
Baligh Uddin
7bc83dc414
Import translations. DO NOT MERGE
...
Change-Id: I179193c20f5362e2c1afb3ea15c623e63e15a688
Auto-generated-cl: translation import
2014-07-19 21:41:49 +00:00
Baligh Uddin
d1597c4f5f
Import translations. DO NOT MERGE
...
Change-Id: I3abf5d2591425f79a3b1afa86f161d4a5e197796
Auto-generated-cl: translation import
2014-07-16 17:37:09 -07:00
Wei Liu
b7697c698b
am c84e73d1: am 9d43fa84: Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
...
* commit 'c84e73d1035d99743da243a202c1499f70518620':
Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
2014-07-15 00:49:30 +00:00
Wei Liu
c84e73d103
am 9d43fa84: Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
...
* commit '9d43fa84054dc3c0229f5138495f6b6cdf0477db':
Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
2014-07-14 23:18:00 +00:00
Wei Liu
9d43fa8405
Update the string for take bug report to say "Swipe left to share" instead of "Touch to share"
...
BUG: 15589908
Change-Id: I69e176343906c8f87b8f50ba844b15e3e89f0c48
2014-07-11 23:11:04 +00:00
Baligh Uddin
3bea0921e6
Import translations. DO NOT MERGE
...
Change-Id: Ica5e9d382ccc718954892f8f3668503a92283548
Auto-generated-cl: translation import
2014-07-05 09:40:01 -07:00
Baligh Uddin
2300d06a2e
Import translations. DO NOT MERGE
...
Change-Id: I66faac7461c003000096bc838fbf166b6fbff2c8
Auto-generated-cl: translation import
2014-06-30 14:35:00 +00:00
Baligh Uddin
21681dcda4
Import translations. DO NOT MERGE
...
Change-Id: I7f78f8188fd6b2f04f96a5846c13314687c2554e
Auto-generated-cl: translation import
2014-06-19 16:53:45 -07:00
Baligh Uddin
a6ce7a61d4
Import translations. DO NOT MERGE
...
Change-Id: Ifd2e0d58323cb151e07843bfd446ff11f461e01e
Auto-generated-cl: translation import
2014-06-04 08:11:43 -07:00
Baligh Uddin
d4aee346bf
Import translations. DO NOT MERGE
...
Change-Id: Ie2c80be44bcf5219e68a43cf68b58419c748e186
Auto-generated-cl: translation import
2014-06-02 09:44:42 -07:00
Baligh Uddin
e1f61548be
Import translations. DO NOT MERGE
...
Change-Id: Ic7ea2f12eba189dba86047d66b0ca86af36b9dc7
Auto-generated-cl: translation import
2014-05-20 08:18:14 -07:00
Allen Hair
d5b9768f53
am 3647eec9: Merge "Fixed shell manifest to use correct permission."
...
* commit '3647eec94bd47e45dc1db1ce23437ae45fa6247d':
Fixed shell manifest to use correct permission.
2014-04-25 17:01:28 +00:00
Allen Hair
59d2b43ad0
Fixed shell manifest to use correct permission.
...
Changed RENDER_STATS to FRAME_STATS. There is no RENDER_STATS
permission.
Change-Id: Iaf81b9e5a1580108da2d58e9c00a77a2b1093fdf
2014-04-23 10:23:07 -07:00
Baligh Uddin
368a984e1b
Import translations. DO NOT MERGE
...
Change-Id: I6ac555548303cd6b32be846c0479bbe78a977c3a
Auto-generated-cl: translation import
2014-04-22 16:37:07 -07:00
Baligh Uddin
0e24053e2f
Import translations. DO NOT MERGE
...
Change-Id: Ie838a6accf3cf31099993dde7f01763a741ef882
Auto-generated-cl: translation import
2014-04-16 14:25:55 -07:00
Svetoslav
dd137a85d3
resolved conflicts for merge of 6be2f952 to master-lockscreen-dev
...
Conflicts:
core/java/android/view/IWindowManager.aidl
tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
2014-04-10 12:48:07 -07:00
Svetoslav
b3035749d4
am 6be2f952: Merge "Adding render stats APIs to UiAutomation (framework)."
...
* commit '6be2f95202237b7284542e692273d13a5bd26913':
Adding render stats APIs to UiAutomation (framework).
2014-04-10 19:36:27 +00:00
Svetoslav
1376d600d8
Adding render stats APIs to UiAutomation (framework).
...
bug:12927198
Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
2014-04-07 17:01:42 -07:00
Alan Viverette
7dd791f124
am e3c38a0b: Fix recents theme, add missing headers
...
* commit 'e3c38a0b0ebefa0a86be944259467c8acc9e5e49':
Fix recents theme, add missing headers
2014-04-02 22:43:27 +00:00
Alan Viverette
8246270b53
am e3c38a0b: Fix recents theme, add missing headers
...
* commit 'e3c38a0b0ebefa0a86be944259467c8acc9e5e49':
Fix recents theme, add missing headers
2014-04-02 22:43:07 +00:00
Alan Viverette
e3c38a0b0e
Fix recents theme, add missing headers
...
Change-Id: Ib8eea6153eaf7e0e93e54c69fe59e63e98a409a6
2014-04-02 15:39:13 -07:00
Alan Viverette
01cefbc5b3
am b325345e: Merge "Switch framework Holo references to Quantum.Light"
...
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
2014-04-02 22:23:17 +00:00
Alan Viverette
3a3395042e
am b325345e: Merge "Switch framework Holo references to Quantum.Light"
...
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
2014-04-02 22:18:59 +00:00
Alan Viverette
6259933ec9
Switch framework Holo references to Quantum.Light
...
Change-Id: Ib545a143f1959b6104adbc9d594dd626851d90b3
2014-04-01 14:57:39 -07:00
Baligh Uddin
97f19cd8c9
Import translations. DO NOT MERGE
...
Change-Id: I83aec8a46e0fa926b11db5798e5d53e98759a563
Auto-generated-cl: translation import
2014-03-24 09:40:48 -07:00
Baligh Uddin
3042c1d148
Import translations. DO NOT MERGE
...
Change-Id: I0c7513f5c141219c6d763119142eea562ce9be39
Auto-generated-cl: translation import
2014-03-19 09:42:07 -07:00