Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
267,260 Commits 3 Branches 0 Tags
dfd2e37b01596090c50deacba202fa776fe2a2cd
Commit Graph

15516 Commits

Author SHA1 Message Date
Amith Yamasani
9f62bf9370 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp 
am: b8ab1d3b12

Change-Id: I9f4879ae27560ade8fa4e6124908c3dced68feb1
 2016-06-08 19:03:36 +00:00
Amith Yamasani
b8ab1d3b12 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp 
Change-Id: Id4b3de71842eedd49684b367ed993f44f2f91970
 2016-06-08 11:50:57 -07:00
Amith Yamasani
c33507d441 Merge \"Add a separate read permission for oem unlock state\" into nyc-dev 
am: 718f321369

Change-Id: I934a06f985319d4520044aff7adf4329f0c27953
 2016-06-08 18:16:40 +00:00
Amith Yamasani
718f321369 Merge "Add a separate read permission for oem unlock state" into nyc-dev 2016-06-08 17:55:41 +00:00
Baligh Uddin
a2e9249983 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I717395f19e8605b4ad4af00b8601ff59c3acb73c
 2016-06-07 17:02:34 -07:00
TreeHugger Robot
cbfd66566c Merge "Import translations. DO NOT MERGE" 2016-06-07 02:27:55 +00:00
Eino-Ville Talvala
d9a7b1e07b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev am: fe3ecdab1b 
am: abb7488998

* commit 'abb74889982603f6070100033c8fa2b1eef3d8de':
  Revert "Internal API for cross-task Activity used by assistant."

Change-Id: Id397afe9221e2562e096befc1b105233618ca7ef
 2016-06-06 23:55:58 +00:00
Eino-Ville Talvala
abb7488998 Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 
am: fe3ecdab1b

* commit 'fe3ecdab1b461d811825ce363d7041f3c8c120c3':
  Revert "Internal API for cross-task Activity used by assistant."

Change-Id: If16a43f4a17e71cc12ed7c912ed5e6a46c85e56c
 2016-06-06 23:50:36 +00:00
TreeHugger Robot
fe3ecdab1b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 2016-06-06 23:44:34 +00:00
Bill Yi
f6620acbe0 Import translations. DO NOT MERGE 
Change-Id: Ia47328b8bfe256eb0fe17b869b8bbcce19ff2cd2
Auto-generated-cl: translation import
 2016-06-06 15:28:06 -07:00
Eino-Ville Talvala
563df3b328 Revert "Internal API for cross-task Activity used by assistant." 
This reverts commit 04073dc5be.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
 2016-06-06 22:04:54 +00:00
Bill Yi
16b6a5d9bd Import translations. DO NOT MERGE 
Change-Id: I5a5b4ba97a9d614542391d6af2e48b8edf8c0698
Auto-generated-cl: translation import
 2016-06-06 13:37:26 -07:00
Jorim Jaggi
f5e5c3a72a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev am: c27660d45a 
am: acfed07f72

* commit 'acfed07f725466e866445cfdf4fda94fa0e8f0a0':
  Add new attributes for wallpaper info

Change-Id: Ie439547cb6964c1f90b2ac313408a502027ccd25
 2016-06-04 00:41:07 +00:00
Jorim Jaggi
acfed07f72 Merge "Add new attributes for wallpaper info" into nyc-mr1-dev 
am: c27660d45a

* commit 'c27660d45a920af49c9e53b1cabaa32fd4b3046c':
  Add new attributes for wallpaper info

Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
 2016-06-04 00:27:04 +00:00
TreeHugger Robot
c27660d45a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev 2016-06-04 00:22:06 +00:00
George Mount
a9e1ad04fb Merge "Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev am: 3af59ef42c" into nyc-mr1-dev-plus-aosp 
am: 74babe679b

* commit '74babe679b0f8e17ed73280b18bc19153764c55e':
  Internal API for cross-task Activity used by assistant.

Change-Id: I985c67a465e88f74e66600709c187c3dfc9734e9
 2016-06-04 00:10:35 +00:00
George Mount
579a1e973f Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 
am: 3af59ef42c

* commit '3af59ef42c83fbe4bf9e54f807597bddc6aa7ecd':
  Internal API for cross-task Activity used by assistant.

Change-Id: Idb8c49437ff7d151e186edd2112e4def8d7a7e15
 2016-06-03 23:27:31 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info 
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
 2016-06-03 15:50:31 -07:00
George Mount
3af59ef42c Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-03 22:22:53 +00:00
Amith Yamasani
d2b21047c8 Add a separate read permission for oem unlock state 
New privileged permission READ_OEM_UNLOCK_STATE added
for system privileged apps.

Changing the unlock state still requires the old
permission OEM_UNLOCK_STATE, which is signature protected.

Bug: 28953956
Change-Id: Iedd2ad1d2d1dc3ae91122d7c406e3ee623a47d61
 2016-06-03 14:33:26 -07:00
Jeff Sharkey
a3ddfd500b Follow refactoring to fix build. 
Change-Id: I763376c73388de42f3545c05983d00392c1d2629
 2016-06-03 15:26:20 -06:00
George Mount
04073dc5be Internal API for cross-task Activity used by assistant. 
29091742

A new internal API has been created for use by assistant
to launch an Activity Transition from a non-Activity.

The ActivityOptions are also passed along when using
a spring board Activity so that the shared elements
can be properly synchronized.

This also fixes TransitionManager.endTransition so
that it forces Transitions to end the animations.

Change-Id: Id18d9765bfc0c7b438e17966455aa66d3fa3aeda
 2016-06-03 14:08:06 -07:00
Jeff Sharkey
a0d2e12fe0 resolve merge conflicts of 0c26c32 to master 
Change-Id: I2398a72d7a3575743e5948bc16b1b8582ccf106b
 2016-06-03 15:00:10 -06:00
Wang Xiaolei
0c26c32403 Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9 
am: f5b0bf3563

* commit 'f5b0bf356350b53d02d6dfea96defd087f8c2f2a':
  Revert "Revert "Finalize resource IDs for N.""

Change-Id: I7b86da45e999d538641dcc4221c25eb148adf495
 2016-06-03 20:01:37 +00:00
Jeff Sharkey
f5b0bf3563 Merge commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9 
Change-Id: Ie4e0b91f5479f43864b86ff013ff8eb7bed6cd86
 2016-06-03 13:53:48 -06:00
Michael Wright
36481749e6 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev 
am: 44b24c9b38

* commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc':
  Revert "Revert "Finalize resource IDs for N.""

Change-Id: Ie8327dac7fbecebe98ce9f7cc9c3d29d818b23f6
 2016-06-03 19:27:36 +00:00
Wang Xiaolei
44b24c9b38 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev 2016-06-03 18:08:21 +00:00
Bill Yi
a5c543bf35 Import translations. DO NOT MERGE 
Change-Id: Iec10d485540939eca94ecf3d013cb7a9cda8c4f2
Auto-generated-cl: translation import
 2016-06-03 03:36:04 -07:00
Bill Yi
40b69850c5 Import translations. DO NOT MERGE 
Change-Id: I08aeb7a5fb63ed7d10a218d86365331c2ba02b4e
Auto-generated-cl: translation import
 2016-06-02 21:18:31 -07:00
Todd Kennedy
d2bbc1e2a0 Merge "Round icons" into nyc-mr1-dev am: 7d64d64269 
am: a84b5d0ebd

* commit 'a84b5d0ebdeb7d4d5670d490380f5a7a48282b90':
  Round icons

Change-Id: Iff9a17b9f826053c31aaa6ada8fb167f8e4520b5
 2016-06-03 00:44:54 +00:00
Todd Kennedy
a84b5d0ebd Merge "Round icons" into nyc-mr1-dev 
am: 7d64d64269

* commit '7d64d642692ff6728ee83e1a0d8658909d1bdd44':
  Round icons

Change-Id: I5578f3eb7b7ffc7791a5a4305b0defba38963bba
 2016-06-03 00:38:26 +00:00
Todd Kennedy
bb8a42da70 Round icons 
Allow applications to specify "android:roundIcon" in all places
they can already specify the rectangular "android:icon".

Bug: 28981414
Change-Id: I167163d650db80f4949274d365e7fee9aceacb3a
 2016-06-02 15:57:54 -07:00
Suprabh Shukla
1c6c666288 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev am: 5ac8499b25 
am: ef3a63ce74

* commit 'ef3a63ce74bea3f1bd4a033e34070954aa905135':
  Changing user switching messages for demo mode

Change-Id: Ic8c41f7790d40198f20ef088cf37a11a0f153a4c
 2016-06-02 18:55:33 +00:00
Suprabh Shukla
ef3a63ce74 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev 
am: 5ac8499b25

* commit '5ac8499b25b1533c7e605f8b2cf3861e7cd7970c':
  Changing user switching messages for demo mode

Change-Id: I822aed2c9762f680e3697c18e759168c2a72b1f2
 2016-06-02 18:50:51 +00:00
TreeHugger Robot
5ac8499b25 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev 2016-06-02 18:36:09 +00:00
Suprabh Shukla
ff0939ba7d Changing user switching messages for demo mode 
Bug: 27280140
Change-Id: I803ba8cf9dbf23b4a66cca8af57441faa2b354b6
 2016-06-01 23:28:12 -07:00
Makoto Onuki
9a968df828 Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7 
am: facbcba617

* commit 'facbcba617766402b03c2b1ecc889dfc0fd9c4a2':
  ShortcutManager: API rename

Change-Id: If7da8f53354762bb7e035ab8a9c66e73886545ec
 2016-06-02 00:50:25 +00:00
Adrian Roos
3a866db8a1 Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf am: 62eb79e6c8" into nyc-mr1-dev-plus-aosp 
am: 0eb85b9d7c

* commit '0eb85b9d7cbac4122fb56a60b8ace2f0913536d9':
  AppError: Change "close" to "close app"

Change-Id: I29f2ce210d661c95373b0f754d8205facfe9b79e
 2016-06-01 23:48:55 +00:00
Robert Greenwalt
98901e8a01 Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e am: ce82f1c16a am: be718d8836 
am: 45fea4d6e9

* commit '45fea4d6e9732d12fcc63243c678c405d7efae40':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: Ib722fb929db6fba58b6c6aa6017b444742efec6e
 2016-06-01 23:39:32 +00:00
Makoto Onuki
facbcba617 Merge "ShortcutManager: API rename" into nyc-mr1-dev 
am: 60585d12e7

* commit '60585d12e717d6dd02c89cf177159dbb1c7b4fc9':
  ShortcutManager: API rename

Change-Id: Ieca236424835edf8b141706733b3bc98657547ab
 2016-06-01 23:32:22 +00:00
Adrian Roos
d38b5a350b Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf 
am: 62eb79e6c8

* commit '62eb79e6c80960636982d056c89b97a0c95d9987':
  AppError: Change "close" to "close app"

Change-Id: Ib622156c3af13a6cec611f2613f0729b839ed3db
 2016-06-01 23:01:55 +00:00
Adrian Roos
2bad55cb1b Merge "AppError: Change "close" to "close app"" into nyc-dev 
am: b4cd4650cf

* commit 'b4cd4650cfd634df75e9e23f9585a756823bd012':
  AppError: Change "close" to "close app"

Change-Id: If2879efeaf2c3b4bd6112a22d81b59e32acbbc13
 2016-06-01 22:44:44 +00:00
Makoto Onuki
60585d12e7 Merge "ShortcutManager: API rename" into nyc-mr1-dev 2016-06-01 22:44:11 +00:00
Adrian Roos
8bfaf5fbff Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f am: 72bc1299f2 
am: 86a0e3befe

* commit '86a0e3befe175ebfed8a701ab9be192f909345c3':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: I53c30dbef2ebcd9f85a753dffd93ddafbd000508
 2016-06-01 21:12:10 +00:00
Vasco Brito
45fea4d6e9 Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e am: ce82f1c16a 
am: be718d8836

* commit 'be718d8836e85b8bff0de83e4fefbd92675c0855':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: Ie1371d5dd1458038a2a2a93bba7c2e45f1d671ea
 2016-06-01 19:14:29 +00:00
Robert Greenwalt
be718d8836 Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e 
am: ce82f1c16a

* commit 'ce82f1c16a4c10e003a11020fcb3c232010c40c6':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: Id0b350da8369340a4ac538358481577b22bc73d3
 2016-06-01 19:07:45 +00:00
Adrian Roos
62eb79e6c8 Merge "AppError: Change "close" to "close app"" into nyc-dev 
am: b4cd4650cf

* commit 'b4cd4650cfd634df75e9e23f9585a756823bd012':
  AppError: Change "close" to "close app"

Change-Id: I8d4a7a2517321551a057776ecf30dc35c6168e4d
 2016-06-01 18:27:55 +00:00
Adrian Roos
b4cd4650cf Merge "AppError: Change "close" to "close app"" into nyc-dev 2016-06-01 18:14:43 +00:00
Adrian Roos
86a0e3befe Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f 
am: 72bc1299f2

* commit '72bc1299f2020c4acd51defed6da430d61edc5fa':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: Ifcba6fe03700c39b9777c3c08ffa1c4bf4873dd7
 2016-06-01 17:34:05 +00:00
Adrian Roos
adc3f1ec2b Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev 
am: ff39d3ec2f

* commit 'ff39d3ec2fa773a50bbd069a40570767c80fd404':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: I4f725f15c12a3e5f49a521564ad2be54b75b2dd2
 2016-06-01 17:25:52 +00:00