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

130032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
012785d8cb Merge "Don't auto scroll empty lists" 2014-04-07 16:31:55 +00:00
Alan Viverette
a111328412 Don't auto scroll empty lists 
BUG: 12930741
Change-Id: I22bcebace0d5e0d519d38b34d6312ffff5b62f9b
 2014-04-07 09:30:13 -07:00
George Mount
a9364665d6 am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions." 
* commit '6fd0ef7f7367ce6e2272e9c517793d502fe7f8da':
  Add Transitions useful for Activity transitions.
 2014-04-07 16:22:45 +00:00
George Mount
65c87ff167 am dde10d07: Merge "Implement "Back" for Activity Transitions." 
* commit 'dde10d073f819e78c0b26d7f37ed10f01b45125c':
  Implement "Back" for Activity Transitions.
 2014-04-07 16:22:41 +00:00
George Mount
6fd0ef7f73 Merge "Add Transitions useful for Activity transitions." 2014-04-07 16:17:40 +00:00
George Mount
dde10d073f Merge "Implement "Back" for Activity Transitions." 2014-04-07 16:17:32 +00:00
Baligh Uddin
c4a80acf9c Import translations. DO NOT MERGE 
Change-Id: Iae9d84c74d8580328bab4e9bab8e7ca5dfc90693
Auto-generated-cl: translation import
 2014-04-07 09:16:57 -07:00
George Mount
d6107a3170 Add Transitions useful for Activity transitions. 
Slide: transition in and out of the edge of the scene.
Explode: transition to the scene borders

Moved capability from Fade to Visibility.

Change-Id: Ibeb0d8f751c990edc467570d9665fbe251af2703
 2014-04-07 09:14:09 -07:00
Baligh Uddin
016409812a Import translations. DO NOT MERGE 
Change-Id: I5aca3127cc5a9cde5f594d7d12fe0bd2c7a764f4
Auto-generated-cl: translation import
 2014-04-07 09:09:09 -07:00
George Mount
cb4b7d999e Implement "Back" for Activity Transitions. 
Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
 2014-04-07 09:00:13 -07:00
Raph Levien
9e2121a7a2 am 77b1286f: Merge "Fix extra text appearing after ellipsis" 
* commit '77b1286f7f949ef6ec8a254648380e211ee8b8eb':
  Fix extra text appearing after ellipsis
 2014-04-07 15:31:50 +00:00
Raph Levien
77b1286f7f Merge "Fix extra text appearing after ellipsis" 2014-04-07 15:27:12 +00:00
Alexandra Gherghina
2ea79b063d am 45849beb: Merge "Introduces intents for adding and removing a managed profile." 
* commit '45849beb3bd0d9f4494bdcce919dcf995bcb881b':
  Introduces intents for adding and removing a managed profile.
 2014-04-07 12:36:25 +00:00
Alexandra Gherghina
45849beb3b Merge "Introduces intents for adding and removing a managed profile." 2014-04-07 12:26:56 +00:00
Alexandra Gherghina
c17d7e0d64 Introduces intents for adding and removing a managed profile. 
Change-Id: I6b8b7a314ea52bfd0c750da94066156e73a0f2f5
 2014-04-07 12:38:24 +01:00
Kenny Guy
b5243150b3 am 2eadb856: Merge "Launch recents with the correct user." 
* commit '2eadb856d0c3747545fa2d19bec3270d112cf49c':
  Launch recents with the correct user.
 2014-04-07 11:01:01 +00:00
Kenny Guy
2eadb856d0 Merge "Launch recents with the correct user." 2014-04-07 10:54:58 +00:00
Jaewan Kim
acdfa2a65d am baa00cc3: Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" 
* commit 'baa00cc350572c34718d770a31ebe2f76ffc9607':
  Revert "Refactor IpConfiguration from WifiConfiguration"
 2014-04-07 09:10:11 +00:00
Jaewan Kim
fce727b5c7 am e277433e: Revert "Hide IpConfiguration" 
* commit 'e277433ed718be7651ab893f85d87f1ab4da896c':
  Revert "Hide IpConfiguration"
 2014-04-07 09:10:08 +00:00
Jaewan Kim
baa00cc350 Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" 2014-04-07 09:01:43 +00:00
Jaewan Kim
6789797485 Revert "Refactor IpConfiguration from WifiConfiguration" 
This reverts commit 1284767ceb1affa6d5af77fd26ccf7322df48a6d.

Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
 2014-04-07 09:01:24 +00:00
Jaewan Kim
e277433ed7 Revert "Hide IpConfiguration" 
This reverts commit d07372e2e96ed6d2012db8518e05018c9710cafb.

Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a
 2014-04-07 08:54:45 +00:00
Jaewan Kim
62a9daccac am d07372e2: Hide IpConfiguration 
* commit 'd07372e2e96ed6d2012db8518e05018c9710cafb':
  Hide IpConfiguration
 2014-04-07 08:43:19 +00:00
Jaewan Kim
d07372e2e9 Hide IpConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
 2014-04-07 17:11:39 +09:00
Jaewan Kim
a710bdf2e7 am ce245e1c: Merge "Refactor IpConfiguration from WifiConfiguration" 
* commit 'ce245e1c6546ef05a8645d2d54bfa3e2e4178046':
  Refactor IpConfiguration from WifiConfiguration
 2014-04-07 05:58:23 +00:00
Jaewan Kim
ce245e1c65 Merge "Refactor IpConfiguration from WifiConfiguration" 2014-04-07 04:40:45 +00:00
Jaewan Kim
1284767ceb Refactor IpConfiguration from WifiConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
 2014-04-07 11:35:35 +09:00
quddusc
a6a4e858c3 am e49ba1a3: am f403d60f: am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'e49ba1a3fc6c915a4ec6c526ecb25afe2dbd7f32':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:50:22 +00:00
quddusc
e49ba1a3fc am f403d60f: am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'f403d60fc8dfe2b833a65b6933a07c44d849e831':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:45:01 +00:00
quddusc
f403d60fc8 am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit '17878a9ab5c58f5b245bbdd0e8e16abbcde4a995':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:38:52 +00:00
quddusc
17878a9ab5 am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'b430ec756473330f47bda2d8f0c266b3398169c9':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:32:35 +00:00
quddusc
b430ec7564 am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit '7db3875cdca4c94cb667d2d0cc86718f15e3305c':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:27:25 +00:00
quddusc
7db3875cdc Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 2014-04-05 22:23:36 +00:00
Etienne Le Grand
1782d21ce4 am 8bd72e50: am acf395fd: am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit '8bd72e50335d3a276ffa41928c791c8d50d5d028':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 17:11:26 +00:00
Etienne Le Grand
8bd72e5033 am acf395fd: am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit 'acf395fd9441bce9fbe68c1b7efbf824570284bc':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 17:05:38 +00:00
Etienne Le Grand
acf395fd94 am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit '819239e5bec90ee3c861ac45fffac4a832a183a1':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 09:05:50 +00:00
Etienne Le Grand
4f49f593c1 am fa1d2417: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit 'fa1d2417d296e28a48a8c4a5cfb932172edbdd65':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 06:28:37 +00:00
Etienne Le Grand
fa1d2417d2 Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
(cherry picked from commit 819239e5bec90ee3c861ac45fffac4a832a183a1)
 2014-04-05 06:14:24 +00:00
Etienne Le Grand
819239e5be Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
 2014-04-05 04:47:14 +00:00
Etienne Le Grand
b39f93ca69 am ded26473: am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'ded264733036bb566c54da5b771d63f57213c84e':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 04:01:33 +00:00
Etienne Le Grand
ded2647330 am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'bdfe384106de364ea2effac6ab80108556d11649':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 03:53:49 +00:00
Etienne Le Grand
bdfe384106 am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 01:52:27 +00:00
Christopher Tate
c7e9b95d75 am 706f50c3: Merge "Back up the preferred home app, if any" 
* commit '706f50c3abe0d899304313fd8631c35098d9866d':
  Back up the preferred home app, if any
 2014-04-05 01:31:36 +00:00
Christopher Tate
706f50c3ab Merge "Back up the preferred home app, if any" 2014-04-05 01:27:09 +00:00
Deepanshu Gupta
9967196da4 am 1cb3e814: Merge "Fix sdk build" 
* commit '1cb3e81421ada146b35515942299fb867b82048d':
  Fix sdk build
 2014-04-05 01:11:07 +00:00
Deepanshu Gupta
1cb3e81421 Merge "Fix sdk build" 2014-04-05 01:06:00 +00:00
Deepanshu Gupta
ddf286282d Fix sdk build 
Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
 2014-04-04 18:02:57 -07:00
Christopher Tate
a99d02170b Back up the preferred home app, if any 
If the user has stated a preference about their home app, make sure we
capture that so that a system restore can return them to that preferred
situation.  It's built into the system metadata so that we can, if
necessary, fast-path configuration of that home app while the rest of
the restore operation is in flight.

Change-Id: I64dfee8f7a2a9e40f556cd19298d7b367c6aa8dc
 2014-04-04 17:40:34 -07:00
Michael Wright
25bace90de am 118d1134: Merge "Fix size_t format specifier" 
* commit '118d113478a2c58e7997f926a8dd1bc5ca5f5dc8':
  Fix size_t format specifier
 2014-04-04 23:55:24 +00:00
Michael Wright
118d113478 Merge "Fix size_t format specifier" 2014-04-04 23:51:36 +00:00