drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,515 Commits 1 Branch 0 Tags
Commit Graph

245515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
5441a248f4 Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88 
am: 1bb51deaf4  -s ours

Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61
 2016-07-12 19:52:44 +00:00
Sudheer Shanka
1bb51deaf4 Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 am: 008d66e49c 
am: e8458d8f88

Change-Id: If984b3437bc60d99e693907aef24f3b7b1218836
 2016-07-12 19:47:44 +00:00
Sudheer Shanka
e8458d8f88 Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 
am: 008d66e49c

Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca
 2016-07-12 19:42:38 +00:00
Sudheer Shanka
008d66e49c Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours 
am: 7975dd5b48

Change-Id: I343863180866b38af4f91a6f79068c21096e7ce0
 2016-07-12 19:34:38 +00:00
Sudheer Shanka
7975dd5b48 Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e 
am: fd0757f195  -s ours

Change-Id: I17b97d1cfefa769b07ea798c6f87f8af22a31329
 2016-07-12 19:27:37 +00:00
Sudheer Shanka
fd0757f195 Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f 
am: 177422c91e

Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
 2016-07-12 19:20:34 +00:00
Sudheer Shanka
177422c91e Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev 
am: f1d9152f9f

Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
 2016-07-12 19:11:35 +00:00
Sudheer Shanka
f1d9152f9f Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev 2016-07-12 19:03:14 +00:00
Kevin Hufnagle
4c8d924d4c Merge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev 2016-07-12 17:49:10 +00:00
Amith Yamasani
e278cf7665 Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev 2016-07-12 17:40:13 +00:00
TreeHugger Robot
a2e1bb8c3e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-07-12 16:12:00 +00:00
TreeHugger Robot
84c67fa304 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-07-12 16:11:12 +00:00
Joe Fernandez
ba64d0ec2e Merge "docs: July 2016 Dashboard update" into nyc-dev 2016-07-12 16:09:54 +00:00
Joe Fernandez
93362ace1a docs: July 2016 Dashboard update 
Change-Id: Ia2c6488340e7d17696ffe67ba120cb30bea94717
 2016-07-12 09:06:29 -07:00
Gopinath Elanchezhian
8fabbb89c0 Merge "App launch - Test app changes" into nyc-dev 2016-07-12 16:02:43 +00:00
Bill Yi
19516ee85a Import translations. DO NOT MERGE 
Change-Id: I336a5cd0babcb768a62375cb8d63afa7a7d9532c
Auto-generated-cl: translation import
 2016-07-11 23:21:45 -07:00
Bill Yi
3039b1d5ab Import translations. DO NOT MERGE 
Change-Id: I59f3cb6bc56b5bb55e32ea870b875ab30c8bd28d
Auto-generated-cl: translation import
 2016-07-11 23:04:28 -07:00
Sudheer Shanka
3f12e8e2bf DO NOT MERGE: Reduce shell power over user management. 
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.

Bug: 29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
 2016-07-12 01:59:08 +00:00
Bert McMeen
3ed7666f03 Merge \\"Docs: Release Notes for Dev Preview 2\\" into mnc-io-docs am: b039c753f3 
am: 40df51ce20

Change-Id: I2d698e096a81093a8471dcd3dcf1994986c29a97
 2016-07-12 00:50:19 +00:00
Bert McMeen
40df51ce20 Merge \"Docs: Release Notes for Dev Preview 2\" into mnc-io-docs 
am: b039c753f3

Change-Id: I39f6735f53186f6cb03036a3c7731ca06449acf1
 2016-07-12 00:45:11 +00:00
Bert McMeen
b039c753f3 Merge "Docs: Release Notes for Dev Preview 2" into mnc-io-docs 2016-07-12 00:35:08 +00:00
Bert McMeen
d8c8d710b7 Merge \\"Docs: Information on OTA updates\\" into mnc-io-docs am: 2f297621a1 
am: 1dee5f4dbe

Change-Id: Ie1685c1393e740fb7d44ef8dbb714ed408eb4319
 2016-07-12 00:24:17 +00:00
Bert McMeen
8496de09a5 Docs: Release Notes for Dev Preview 2 
Bug: 29419006
Change-Id: I24f9aa03db1150ab303fa222009f888e0e4cb01d
 2016-07-11 17:23:07 -07:00
Bert McMeen
1dee5f4dbe Merge \"Docs: Information on OTA updates\" into mnc-io-docs 
am: 2f297621a1

Change-Id: I766877a188e5878001da9ffe91d2f09f49e8f3ee
 2016-07-12 00:18:48 +00:00
Bert McMeen
2f297621a1 Merge "Docs: Information on OTA updates" into mnc-io-docs 2016-07-12 00:14:48 +00:00
Kevin Hufnagle
2d10c5a85c docs: Removed self-referencing links on Apps and Games pages. 
The "Distribute > Stories > Apps" and "Distribute > Stories > Games"
pages on DAC included cards that linked to the current page (in
other words, they were circular/self-referencing links).

Removed the metadata from the apps.html and games.html pages
accordingly.

Bug: 29881467
Change-Id: I2b6555ee565500e978ba3c4edef4d93b0bf9a239
 2016-07-11 16:48:35 -07:00
Bert McMeen
4465838b59 Docs: Information on OTA updates 
Bug: 29545156
Change-Id: I557205fe9c1990d0dbfc020e20f610dae80bbcc5
 2016-07-11 16:44:41 -07:00
Hemal Patel
e9ec18cd9f Merge \\"Docs: Changed Blank Activity to Basic Activity\\" into mnc-io-docs am: 93dd99c6aa 
am: 92c664b13d

Change-Id: I52034f812994545893e6e4e8a9de9de79f593bb2
 2016-07-11 23:32:21 +00:00
Hemal Patel
79a3f25ce4 Merge \\"Docs: Replaced fill_parent with match_parent\\" into mnc-io-docs am: 1b72b7955d 
am: 202bfb4fc7

Change-Id: Ie5faab93a9c417f6191bb0855dd3ad9326f0c955
 2016-07-11 23:26:09 +00:00
Hemal Patel
92c664b13d Merge \"Docs: Changed Blank Activity to Basic Activity\" into mnc-io-docs 
am: 93dd99c6aa

Change-Id: I28de4c355c23d96ab52a945bfd26567063f25212
 2016-07-11 23:25:59 +00:00
Hemal Patel
93dd99c6aa Merge "Docs: Changed Blank Activity to Basic Activity" into mnc-io-docs 2016-07-11 23:22:48 +00:00
Hemal Patel
202bfb4fc7 Merge \"Docs: Replaced fill_parent with match_parent\" into mnc-io-docs 
am: 1b72b7955d

Change-Id: I8fec574e1501e84f69d9e53b02b0a7537bd3dc16
 2016-07-11 23:21:01 +00:00
TreeHugger Robot
b6fa207c67 Merge "Fix docs for DragEvent" into nyc-dev 2016-07-11 23:17:42 +00:00
Hemal Patel
1b72b7955d Merge "Docs: Replaced fill_parent with match_parent" into mnc-io-docs 2016-07-11 23:16:53 +00:00
Hemal Patel
03eb43d664 Docs: Replaced fill_parent with match_parent 
The value fill_parent is deprecated in API Level 8 and replaced
with match_parent.

Bug: 19432266
Change-Id: Ie91b4de25f1b12ec93c52531785303d683b18d24
 2016-07-11 16:12:13 -07:00
Amith Yamasani
75db125ebb Include new constant for encryption status in the getter's javadoc 
Added a bit more information in the javadocs about the new constant
ENCRYPTION_STATUS_ACTIVE_PER_USER in related methods/constants so
that developers don't miss checking for that constant when targeting
API Level 24.

Change-Id: Id9cd6248637fe0fc28d5161344abe02614b5f502
Fixes: 30073719
 2016-07-11 15:02:18 -07:00
Hemal Patel
8d25dddf8a Docs: Changed Blank Activity to Basic Activity 
As per Android Studio's latest version, Blank Activity is renamed to
Basic Activity. Hence, fixed step 6 to reflect the change.

Bug: 28177899
Change-Id: I824d60f936975645cd9116e8443771b68e132af9
 2016-07-11 15:00:03 -07:00
Andrew Solovay
f550894eac Merge \\"docs: Fixing badly formatted {@code} strings\\" into mnc-io-docs am: 78125ff7cb 
am: 28528e3c62

Change-Id: Ie9a21623f1491983aab4cfc624818bb3b8720185
 2016-07-11 21:58:47 +00:00
Andrew Solovay
28528e3c62 Merge \"docs: Fixing badly formatted {@code} strings\" into mnc-io-docs 
am: 78125ff7cb

Change-Id: Id68f9e49225f59e8cb94bcd7ab3905790dc2d223
 2016-07-11 21:48:06 +00:00
Andrew Solovay
78125ff7cb Merge "docs: Fixing badly formatted {@code} strings" into mnc-io-docs 2016-07-11 21:40:27 +00:00
Dan Yu
7579d70ca1 Merge \\"docs: Adding Android TV App Link docs\\" into mnc-io-docs am: e0b687048f 
am: 68ef31fc36

Change-Id: I29f43f45d3412baf252af2b11d3cf4ec18025838
 2016-07-11 21:20:57 +00:00
Daniel Yu
68ef31fc36 Merge \"docs: Adding Android TV App Link docs\" into mnc-io-docs 
am: e0b687048f

Change-Id: If4741e27d7e6c37af8382012d8c596a077aae5f5
 2016-07-11 21:16:07 +00:00
Bert McMeen
58b4f0d535 Merge \\"Docs: Gestures docs\\" into mnc-io-docs am: b7b9aa1a51 
am: 1639959f3b

Change-Id: I2e0bd8898404178d11986795e0d402875d03c5bf
 2016-07-11 21:15:05 +00:00
Bert McMeen
fe7b26e229 Merge \\"docs: Updated Create custom drawer view section with new xml attributes.\\" into mnc-io-docs am: 9f1952a77b 
am: ced99e1199

Change-Id: Ieba52265148d0f453757aded27118cd8a9dd5c34
 2016-07-11 21:15:02 +00:00
Dan Yu
e0b687048f Merge "docs: Adding Android TV App Link docs" into mnc-io-docs 2016-07-11 21:11:04 +00:00
Bert McMeen
1639959f3b Merge \"Docs: Gestures docs\" into mnc-io-docs 
am: b7b9aa1a51

Change-Id: Ic509201ae767b921ed523123ab3cd4ab3aa338ee
 2016-07-11 21:07:39 +00:00
sreevanis
ced99e1199 Merge \"docs: Updated Create custom drawer view section with new xml attributes.\" into mnc-io-docs 
am: 9f1952a77b

Change-Id: Ied1d1112ef47428795113ed86d1ed9b1bf5b30d0
 2016-07-11 21:07:37 +00:00
Bert McMeen
b7b9aa1a51 Merge "Docs: Gestures docs" into mnc-io-docs 2016-07-11 21:01:43 +00:00
Bert McMeen
9f1952a77b Merge "docs: Updated Create custom drawer view section with new xml attributes." into mnc-io-docs 2016-07-11 20:59:05 +00:00
Vladislav Kaznacheev
3067bc69d9 Fix docs for DragEvent 
Document that getClipDescription() and getLocaState() do not return valid data
when getAction() == DragEvent.ACTION_DRAG_ENDED.

Bug: 30016099
Change-Id: Id98fe8c5d6f052fc51c8c9e8d55329e162bd96b1
 2016-07-11 13:52:22 -07:00