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

127626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
3ed328ecb7 Merge "Always go through bouncer when unlocking" into master-lockscreen-dev 2014-04-07 17:59:18 +00:00
Jorim Jaggi
9afbfaf52e Merge "Collapse notifications on lockscreen." into master-lockscreen-dev 2014-04-07 17:59:03 +00:00
Jorim Jaggi
313c662f3c Merge "Basic implementation for notifications on lockscreen." into master-lockscreen-dev 2014-04-07 17:58:48 +00:00
Alan Viverette
c6ce5ba083 am 012785d8: Merge "Don\'t auto scroll empty lists" 
* commit '012785d8cbaadb4041707af350e122ad29d22151':
  Don't auto scroll empty lists
 2014-04-07 16:37:30 +00:00
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
c3bf3bb913 am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions." 
* commit '6fd0ef7f7367ce6e2272e9c517793d502fe7f8da':
  Add Transitions useful for Activity transitions.
 2014-04-07 16:22:49 +00:00
George Mount
f4360efb52 am dde10d07: Merge "Implement "Back" for Activity Transitions." 
* commit 'dde10d073f819e78c0b26d7f37ed10f01b45125c':
  Implement "Back" for Activity Transitions.
 2014-04-07 16:22:46 +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
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
George Mount
cb4b7d999e Implement "Back" for Activity Transitions. 
Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
 2014-04-07 09:00:13 -07:00
Raph Levien
45ac9d45c4 am 77b1286f: Merge "Fix extra text appearing after ellipsis" 
* commit '77b1286f7f949ef6ec8a254648380e211ee8b8eb':
  Fix extra text appearing after ellipsis
 2014-04-07 15:29:47 +00:00
Raph Levien
77b1286f7f Merge "Fix extra text appearing after ellipsis" 2014-04-07 15:27:12 +00:00
Alexandra Gherghina
3721343ac4 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:31:56 +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
30e67bd2d4 am 2eadb856: Merge "Launch recents with the correct user." 
* commit '2eadb856d0c3747545fa2d19bec3270d112cf49c':
  Launch recents with the correct user.
 2014-04-07 10:59:41 +00:00
Kenny Guy
2eadb856d0 Merge "Launch recents with the correct user." 2014-04-07 10:54:58 +00:00
Jaewan Kim
c41c48cab0 am baa00cc3: Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" 
* commit 'baa00cc350572c34718d770a31ebe2f76ffc9607':
  Revert "Refactor IpConfiguration from WifiConfiguration"
 2014-04-07 09:06:27 +00:00
Jaewan Kim
1328da27cc am e277433e: Revert "Hide IpConfiguration" 
* commit 'e277433ed718be7651ab893f85d87f1ab4da896c':
  Revert "Hide IpConfiguration"
 2014-04-07 09:06:25 +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
4d50a42055 am d07372e2: Hide IpConfiguration 
* commit 'd07372e2e96ed6d2012db8518e05018c9710cafb':
  Hide IpConfiguration
 2014-04-07 08:42:23 +00:00
Jaewan Kim
d07372e2e9 Hide IpConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
 2014-04-07 17:11:39 +09:00
Jaewan Kim
924b22d46b am ce245e1c: Merge "Refactor IpConfiguration from WifiConfiguration" 
* commit 'ce245e1c6546ef05a8645d2d54bfa3e2e4178046':
  Refactor IpConfiguration from WifiConfiguration
 2014-04-07 05:04:02 +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
6242fdd8c3 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:00 +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
d550c2d626 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:51 +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
Jorim Jaggi
0bed7f258b Always go through bouncer when unlocking 
Previously, we skipped the bouncer when the user didn't had a
security method set. Users without a security method couldn't unlock
their SIM cards though. This change moves the responsibility to
decide what to do to bouncer, so SIM pin is still shown with users
without secrity methods. The bouncer will still be skipped if no
authentication is required.

Bug: 13635952
Change-Id: I0b43628c37d769515e97c29fc5fb5337fe46526f
 2014-04-05 17:05:56 +02:00
Jorim Jaggi
649b7081df Collapse notifications on lockscreen. 
Bug: 13635952
Change-Id: Iee812fa4ee61d633568b98380810311693d44f38
 2014-04-05 17:05:13 +02:00
Jorim Jaggi
03c701ec58 Basic implementation for notifications on lockscreen. 
This change makes PhoneStatusBar expand while the lockscreen is
showing. Further, the KeyguardSimpleHostView is shown by
KeyguardBouncer, and the Bouncer is shown whenever the user tries to
unlock the phone (closing the shade).

Bug: 13635952
Change-Id: I4354b7a7937af6e1c93abf16ad6e485376d16bc2
 2014-04-05 16:50:36 +02: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
2f24dc436e 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:11 +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
3bcc1d77df 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 03:59:09 +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
c10e90ab48 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:30:24 +00:00
Christopher Tate
706f50c3ab Merge "Back up the preferred home app, if any" 2014-04-05 01:27:09 +00:00
Deepanshu Gupta
ce00b81c41 am 1cb3e814: Merge "Fix sdk build" 
* commit '1cb3e81421ada146b35515942299fb867b82048d':
  Fix sdk build
 2014-04-05 01:09:22 +00:00