Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
238,625 Commits 3 Branches 0 Tags
799c311d83fccefffe00a529956612a885f7ab6c
Commit Graph

7667 Commits

Author SHA1 Message Date
Chris Wren
52165a7ab0 Merge "add a ranking service to the rocket" into nyc-dev am: a82662e3f5 
am: 2be6b136a8

* commit '2be6b136a8d0f5de12a8e1f5a3c17c8b4fe27cf1':
  add a ranking service to the rocket
 2016-03-09 16:52:05 +00:00
Chris Wren
2be6b136a8 Merge "add a ranking service to the rocket" into nyc-dev 
am: a82662e3f5

* commit 'a82662e3f5d6a36df9d5c0d33d5847d08273bd93':
  add a ranking service to the rocket
 2016-03-09 16:47:46 +00:00
Alan Viverette
c6dfb332ba Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev am: 2c18cd0823 
am: 669b25d58e

* commit '669b25d58e6b8840f39c95f76c79ab90c46e27e7':
  Set DatePickerListener last during DatePickerDialog construction
 2016-03-09 16:31:06 +00:00
Robin Lee
4a23e41cb4 Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev am: 9acee934de 
am: c3152fe087

* commit 'c3152fe08749c12f017598a37e65277c180f05b6':
  Corrections to javadoc for install & removeKeyPair
 2016-03-09 16:31:05 +00:00
Alan Viverette
669b25d58e Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev 
am: 2c18cd0823

* commit '2c18cd082359533d326081756b4fd2df2164a253':
  Set DatePickerListener last during DatePickerDialog construction
 2016-03-09 16:28:52 +00:00
Robin Lee
c3152fe087 Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev 
am: 9acee934de

* commit '9acee934de1f2242f29a57a854df837e8f38fa04':
  Corrections to javadoc for install & removeKeyPair
 2016-03-09 16:28:51 +00:00
Chris Wren
a82662e3f5 Merge "add a ranking service to the rocket" into nyc-dev 2016-03-09 16:26:56 +00:00
Alan Viverette
2c18cd0823 Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev 2016-03-09 15:52:35 +00:00
Robin Lee
9acee934de Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev 2016-03-09 15:48:25 +00:00
Robin Lee
a1b290e11a Corrections to javadoc for install & removeKeyPair 
Making these more consistent - refer to 'certificate and private key
pair' in titles instead of 'credentials'. It is still used in one place
where 'credentials' makes sense.

Bug: 27533004
Change-Id: Ied80017c6f391646b10921b011be35eea113373f
 2016-03-09 14:38:36 +00:00
Sudheer Shanka
80e6e6332b Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev am: 97e89c624e 
am: 6f0d578ea9

* commit '6f0d578ea97454e550586f58279bf868f24a2d53':
  Update DPM.getWifiMacAddress to take admin component as argument.
 2016-03-08 23:49:35 +00:00
Alan Viverette
4d1ad994d3 Set DatePickerListener last during DatePickerDialog construction 
Prevents us from calling the listener before we're fully set up.

Bug: 27475444
Change-Id: I0def384b60c09c44d36e60503ddb8434055dfb6f
 2016-03-08 18:48:47 -05:00
Sudheer Shanka
6f0d578ea9 Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev 
am: 97e89c624e

* commit '97e89c624e19c0a0ebe3d76506a493cfe29c0558':
  Update DPM.getWifiMacAddress to take admin component as argument.
 2016-03-08 23:09:23 +00:00
Sudheer Shanka
97e89c624e Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev 2016-03-08 22:52:11 +00:00
Selim Cinek
5473760ae0 Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev am: c5ce69f555 
am: 47bc04b0b0

* commit '47bc04b0b0403491fa64ec40d47d669be26bc428':
  Fixed a bug where the font sizes where not enforced correctly
 2016-03-08 22:47:06 +00:00
Selim Cinek
47bc04b0b0 Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev 
am: c5ce69f555

* commit 'c5ce69f555ce703a0bd1d7438e1b87ee9854eae8':
  Fixed a bug where the font sizes where not enforced correctly
 2016-03-08 22:27:42 +00:00
Chris Wren
0efdb88ccc add a ranking service to the rocket 
Bug: 22960980
Change-Id: Ic0e911a2f048a4b47171b338c3de13125852be43
 2016-03-08 17:23:33 -05:00
Selim Cinek
c5ce69f555 Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev 2016-03-08 22:16:44 +00:00
Adrian Roos
6f86c33ee2 Merge "Fix and optimize stripForDelivery" into nyc-dev am: 37b3a4a544 
am: 336256e1f6

* commit '336256e1f6aba6446f307957ba391c75f3a05eb2':
  Fix and optimize stripForDelivery
 2016-03-08 22:05:27 +00:00
Adrian Roos
336256e1f6 Merge "Fix and optimize stripForDelivery" into nyc-dev 
am: 37b3a4a544

* commit '37b3a4a5440f489f65941b8182b33c34f86ffc1d':
  Fix and optimize stripForDelivery
 2016-03-08 21:50:32 +00:00
Adrian Roos
37b3a4a544 Merge "Fix and optimize stripForDelivery" into nyc-dev 2016-03-08 21:47:03 +00:00
Makoto Onuki
af00108ca4 resolve merge conflicts of 1ca3800c44 to master 
Change-Id: I4657cdf99900cd555c3109605e8cbdbb0fed79e6
 2016-03-08 10:39:25 -08:00
Makoto Onuki
1ca3800c44 Merge "Introducing ShortcutManager" into nyc-dev 
am: ed58f5f0aa

* commit 'ed58f5f0aa580dd4a6dc0fd5dc957862309db8d9':
  Introducing ShortcutManager
 2016-03-08 18:05:33 +00:00
Makoto Onuki
ed58f5f0aa Merge "Introducing ShortcutManager" into nyc-dev 2016-03-08 18:01:05 +00:00
Julia Reynolds
9a49d6c8ac Merge "Condition cleanup." into nyc-dev am: 4ed0e8cf8f 
am: ad23e7bf78

* commit 'ad23e7bf78b3826ed2eb4866593386af1533a2b4':
  Condition cleanup.
 2016-03-08 17:47:00 +00:00
Julia Reynolds
ad23e7bf78 Merge "Condition cleanup." into nyc-dev 
am: 4ed0e8cf8f

* commit '4ed0e8cf8fb38b30f7518286e4d52c091339ae63':
  Condition cleanup.
 2016-03-08 17:43:21 +00:00
Julia Reynolds
4ed0e8cf8f Merge "Condition cleanup." into nyc-dev 2016-03-08 17:39:01 +00:00
Julia Reynolds
1d6d16d699 Condition cleanup. 
Change-Id: If978bebac52c0b1438e86339669f409b4b17c6fc
 2016-03-08 10:41:31 -05:00
Jorim Jaggi
80a192059f Merge "Don\'t dock tasks that are non-dockable" into nyc-dev am: f2d7b28115 
am: d31546c9e8

* commit 'd31546c9e8832ee90ea0ba09b111f27539a0abd8':
  Don't dock tasks that are non-dockable
 2016-03-08 15:36:30 +00:00
Jorim Jaggi
d31546c9e8 Merge "Don\'t dock tasks that are non-dockable" into nyc-dev 
am: f2d7b28115

* commit 'f2d7b28115773b324a27173ef31c3e58ce3487a7':
  Don't dock tasks that are non-dockable
 2016-03-08 15:34:30 +00:00
Jorim Jaggi
f2d7b28115 Merge "Don't dock tasks that are non-dockable" into nyc-dev 2016-03-08 15:27:56 +00:00
Jorim Jaggi
aa6c574411 Don't dock tasks that are non-dockable 
Bug: 27200491
Change-Id: I4578441b37734b85ea03b3bb67e57abed8b21182
 2016-03-08 16:20:54 +01:00
Chris Wren
a06ef18843 Merge "rename the asisstant service for the ranker" into nyc-dev am: be3696d425 
am: 4c2e7ad458

* commit '4c2e7ad4589a78dbbe35d585df4b4549db0e3292':
  rename the asisstant service for the ranker
 2016-03-08 15:05:26 +00:00
Chris Wren
4c2e7ad458 Merge "rename the asisstant service for the ranker" into nyc-dev 
am: be3696d425

* commit 'be3696d42552ad55ae0a41e9dd9fe81f5b17d3e7':
  rename the asisstant service for the ranker
 2016-03-08 15:01:20 +00:00
Chris Wren
be3696d425 Merge "rename the asisstant service for the ranker" into nyc-dev 2016-03-08 14:13:45 +00:00
Selim Cinek
89991a205a Fixed a bug where the font sizes where not enforced correctly 
If a style was passed through it wasn't processed correctly.

Bug: 27431551
Change-Id: If764634cbc8a5bf13260a8fc4f392bc8b7482f4d
 2016-03-07 19:51:54 -08:00
Sudheer Shanka
3cb4da16dc Update DPM.getWifiMacAddress to take admin component as argument. 
Bug: 27532280
Change-Id: I3a5e9557c3c6ac43c458c911a5309bdb2655fb66
 2016-03-07 18:51:49 -08:00
Ruben Brunk
dbd8a7ac40 Merge "Add a VR listener service." into nyc-dev am: 875825d0c1 
am: f05c96989c

* commit 'f05c96989cf1bd028cc7d63d31b4cab37ad3b9f2':
  Add a VR listener service.
 2016-03-08 00:27:39 +00:00
Ruben Brunk
f05c96989c Merge "Add a VR listener service." into nyc-dev 
am: 875825d0c1

* commit '875825d0c11f702cd17bd1086a031731d4795d58':
  Add a VR listener service.
 2016-03-08 00:24:52 +00:00
Ruben Brunk
875825d0c1 Merge "Add a VR listener service." into nyc-dev 2016-03-08 00:14:57 +00:00
Selim Cinek
7572c8e201 Merge changes I6e5dc836,Ia0c663f0,I97eb6e79,I8a4a0213,I87798da9, ... into nyc-dev am: f7f4537f4f 
am: 0a0d840ec4

* commit '0a0d840ec45674f32045820546a86b8c8df5c8a0':
  Removed the group expand button
  Removed the bundle number from the header
  Fixed a crash with notification children
  Fixed a bug where the media header wasn't indented
  Fixed fading and dozemode for custom notifications
  Fixed a group bug with a single expanded child
  Fixed a bug where the top child notification wasn't expandable
  Fixed a bug where heads up where not expandable by touch
  Fixed a bug where the wallpaper was shining through the background
 2016-03-07 23:55:41 +00:00
Ruben Brunk
e24b9a6cfa Add a VR listener service. 
Bug: 22855417
Bug: 26724891
Bug: 27364145

- Add an API for VrListenerService, which is bound/unbound
  from the framework when the system VR mode changes.
- Allow only a single bound VrListenerService at a time.
- Monitor allowed VrListenerService implementations from
  VrManagerService and evict services as needed when packages,
  users, or settings change.
- Remove previous VR functionality in NotificationListenerService.
- Add component target to Activity#setVrMode to allow
  explicit selection of the running VrListenerService from
  the current VR activity.

Change-Id: I776335f4441be0e793d3126f2d16faf86a8c621a
 2016-03-07 15:54:12 -08:00
Selim Cinek
0a0d840ec4 Merge changes I6e5dc836,Ia0c663f0,I97eb6e79,I8a4a0213,I87798da9, ... into nyc-dev 
am: f7f4537f4f

* commit 'f7f4537f4f8f7433f80f5c9eae8a62462ec612ea':
  Removed the group expand button
  Removed the bundle number from the header
  Fixed a crash with notification children
  Fixed a bug where the media header wasn't indented
  Fixed fading and dozemode for custom notifications
  Fixed a group bug with a single expanded child
  Fixed a bug where the top child notification wasn't expandable
  Fixed a bug where heads up where not expandable by touch
  Fixed a bug where the wallpaper was shining through the background
 2016-03-07 23:51:30 +00:00
Selim Cinek
f7f4537f4f Merge changes I6e5dc836,Ia0c663f0,I97eb6e79,I8a4a0213,I87798da9, ... into nyc-dev 
* changes:
  Removed the group expand button
  Removed the bundle number from the header
  Fixed a crash with notification children
  Fixed a bug where the media header wasn't indented
  Fixed fading and dozemode for custom notifications
  Fixed a group bug with a single expanded child
  Fixed a bug where the top child notification wasn't expandable
  Fixed a bug where heads up where not expandable by touch
  Fixed a bug where the wallpaper was shining through the background
 2016-03-07 23:43:58 +00:00
Selim Cinek
3b050317bf Removed the bundle number from the header 
Bug: 27431551
Change-Id: Ia0c663f0bab875abba4b35d565f3ac4ed2306079
 2016-03-07 15:11:55 -08:00
Chris Wren
e0ba7eb365 rename the asisstant service for the ranker 
Bug: 22960980
Change-Id: Ibe57933303a488b01c43a7621a488d425d6f707d
 2016-03-07 16:50:27 -05:00
Jeff Sharkey
6fa48c8b4f Merge "Skip publishContentProviders() when we have zero." into nyc-dev am: 2d4d61d326 
am: f8dfd32d31

* commit 'f8dfd32d314a0963c8edafba23ce910b725c5238':
  Skip publishContentProviders() when we have zero.
 2016-03-06 02:56:58 +00:00
Jeff Sharkey
f8dfd32d31 Merge "Skip publishContentProviders() when we have zero." into nyc-dev 
am: 2d4d61d326

* commit '2d4d61d3268a1f1af6b0835eb346bec587983050':
  Skip publishContentProviders() when we have zero.
 2016-03-06 02:54:53 +00:00
Jeff Sharkey
2d4d61d326 Merge "Skip publishContentProviders() when we have zero." into nyc-dev 2016-03-06 02:50:32 +00:00
Jeff Sharkey
3e1958936e Skip publishContentProviders() when we have zero. 
If the list of providers for the application being bound is empty,
don't bother trying to register them.

Bug: 27510621
Change-Id: I921fb70a4c97433fa123fa88e170745ee013ee35
 2016-03-05 19:49:02 -07:00