Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavlin Radoslavov
fa790104f2 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 
am: 0bc61eb176

* commit '0bc61eb176644e243b0e131a29a5f66a4303d9b0':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: Ia2aed3304039a672961608fc900ab8996f67d716
 2016-06-03 01:00:35 +00:00
Pavlin Radoslavov
c9e93d4294 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 
am: 0bc61eb176

* commit '0bc61eb176644e243b0e131a29a5f66a4303d9b0':
  Delay handleEnable() until Bluetooth state is OFF

Change-Id: I8953c12b4df0a60bd3649a055a4dbe03c93534e5
 2016-06-03 01:00:34 +00:00
Pankaj Kanwar
0bc61eb176 Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev 2016-06-03 00:55:50 +00:00
Sanket Padawe
52a8d73d33 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev am: b68601d247 am: 701cd3fe15 
am: f4371f654b

* commit 'f4371f654bcab82a0cd0e2eedbcd3515eaaaf81c':

Change-Id: I66cce9a220281d115e96fa8598d808ee5a62b23b
 2016-06-03 00:53:21 +00:00
Muyuan Li
d6298fd3dd sysui: refactor for extensibility. 
Bug: 28942127
Change-Id: I2f61127a3c4843c22e15a4c6de1d78f165023b27
(cherry picked from commit fbc83b9837e383513eeae90d35fbc50eebeb06b3)
 2016-06-03 00:50:36 +00:00
Sanket Padawe
f4371f654b Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev am: b68601d247 
am: 701cd3fe15

* commit '701cd3fe15148f561c27b9a2b65da79b6f36c1c8':

Change-Id: Ic8ee22af2923a4c8847966d34b7e03712bcfc09e
 2016-06-03 00:48:39 +00:00
Sanket Padawe
34884f3061 Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev am: 1a6b6fc266 
am: a255d5de80

* commit 'a255d5de80f460559e760a73f6f28fca85594eab':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I8331df0c8c9a2e830554d7a29e6f39b9a026c28f
 2016-06-03 00:48:10 +00: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
Adam Lesinski
5fcfdab573 Merge "Allow uses-library under <application>" into nyc-mr1-dev am: c878fb0cb8 
am: b80680af78

* commit 'b80680af787dfb27e5a4b1b0edae8502373c4935':
  Allow uses-library under <application>

Change-Id: I078857ace29f7f35b9efbee99f4278b7c7ba9c9e
 2016-06-03 00:44:51 +00:00
Sanket Padawe
a255d5de80 Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev 
am: 1a6b6fc266

* commit '1a6b6fc2664305de6e7102fa96506910fb7705dd':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4
 2016-06-03 00:44:49 +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
Adam Lesinski
b80680af78 Merge "Allow uses-library under <application>" into nyc-mr1-dev 
am: c878fb0cb8

* commit 'c878fb0cb8a901aae71d965a57e75e682eb6f67f':
  Allow uses-library under <application>

Change-Id: Iaa1f6acb21ec2426a9b8e935efd71cd877bed667
 2016-06-03 00:38:23 +00:00
Sanket Padawe
1a6b6fc266 Merge "Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d" into nyc-mr1-dev 2016-06-03 00:34:03 +00:00
TreeHugger Robot
7d64d64269 Merge "Round icons" into nyc-mr1-dev 2016-06-03 00:32:35 +00:00
Adam Lesinski
c878fb0cb8 Merge "Allow uses-library under <application>" into nyc-mr1-dev 2016-06-03 00:31:37 +00:00
Zhijun He
c8b181e95d Camera2: add deferred output config support 
Allow surfaces to be deferred during session creation. Once the surfaces are ready,
the application can finish the deferred output configuration to be able to submit
requests with these surface targets.

Bug: 28323863
Change-Id: Id6634c3ef2ecc84422a88f63de0a19a0cb496e96
 2016-06-02 17:30:20 -07:00
Suprabh Shukla
296a6319b5 Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev am: 67f82d16ea 
am: 0f4ae5e1a6

* commit '0f4ae5e1a6600763a6ac0180b4bde7e20b041a97':
  Adding an idle timeout to restart demo session

Change-Id: Ib0c2b6641134c91a03b374a2c59d7b3642b6385e
 2016-06-03 00:28:14 +00:00
Suprabh Shukla
0f4ae5e1a6 Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev 
am: 67f82d16ea

* commit '67f82d16ea31f309b402b3a96bafcc9338528ece':
  Adding an idle timeout to restart demo session

Change-Id: I11db70fd323fb908aa137dedf1817fa28b577d79
 2016-06-03 00:23:14 +00:00
Sanket Padawe
a7f74b1d43 Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d 
Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968
 2016-06-02 17:20:08 -07:00
TreeHugger Robot
67f82d16ea Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev 2016-06-03 00:18:18 +00:00
Adam Lesinski
fee32d4d5f Allow uses-library under <application> 
Bug:29106952
Change-Id: I2e780323d86e7050038d34426a30e66a4bbfcc23
 2016-06-02 23:57:55 +00:00
Sanket Padawe
701cd3fe15 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev 
am: b68601d247

* commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
 2016-06-02 23:15:57 +00:00
Sanket Padawe
b68601d247 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev 2016-06-02 23:11:23 +00:00
Svetoslav Ganov
186a7a492d Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff am: bd28e027ed 
am: 47b2ecddee

* commit '47b2ecddee3a3dedfd1781b6fc44666acce64927':

Change-Id: I43b83550342543014486446ced6adb12d26b72e0
 2016-06-02 23:03:43 +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
Makoto Onuki
fdb40b93bb Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am: f6be4c023f" into nyc-mr1-dev-plus-aosp 
am: 7d9b79c41b

* commit '7d9b79c41b53a8f936cb50be40c57a13412197bb':
  ShortcutManager: Break down unit tests

Change-Id: If4e742401c1fa02f48d086f9cbdf50d8100e4f16
 2016-06-02 22:57:50 +00:00
Philip P. Moltmann
694f4ada45 Merge "Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e am: 1eabaff2cb" into nyc-mr1-dev-plus-aosp 
am: 951ff25d95

* commit '951ff25d95b81990a4a5ae96ae76032cdb745cf5':

Change-Id: I364760f36ce53d06837947929355ae66a1eb6ffc
 2016-06-02 22:57:47 +00:00
Makoto Onuki
ac042501c8 ShortcutManager: Implement usage report API 
Bug 28536054

Change-Id: I293e8eaad523e3b0d76d562fc381601633451ed3
 2016-06-02 15:57:40 -07:00
Svetoslav Ganov
47b2ecddee Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff 
am: bd28e027ed

* commit 'bd28e027ed87da6cdc2313481439aeab021b2820':

Change-Id: Ieba2c125f5ea43ee9fe345a48e86415a55c1df5d
 2016-06-02 22:56:48 +00:00
Svetoslav Ganov
0649158cad Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff am: 13f802dc01 
am: a8cdb6f645

* commit 'a8cdb6f6453d23f915d5c470bbdf1000153df383':
  Properly set default voice interactor

Change-Id: I6310a3da7aeb0b8b78918399ef79a0fcc91d4792
 2016-06-02 22:52:13 +00:00
Philip P. Moltmann
e853237b67 Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e am: bf0f82bd69 
am: e34a1df1ad

* commit 'e34a1df1ad0699997399666ce58d4750cbabe1b0':
  Do not rotate PDFPrinter pages.

Change-Id: If5ba09a6d2985e1ffb402329773fd42fa6a25e1b
 2016-06-02 22:52:10 +00:00
Android Build Merger (Role)
7d9b79c41b Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am: f6be4c023f" into nyc-mr1-dev-plus-aosp 2016-06-02 22:48:19 +00:00
Android Build Merger (Role)
951ff25d95 Merge "Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e am: 1eabaff2cb" into nyc-mr1-dev-plus-aosp 2016-06-02 22:48:09 +00:00
Makoto Onuki
2f5430d6a1 Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev 
am: f6be4c023f

* commit 'f6be4c023fbd29d14fdd0b8df6b939b8a46cf553':
  ShortcutManager: Break down unit tests

Change-Id: I31bb7fb30e4de121447acbe1ec5915cde6ae4f7f
 2016-06-02 22:47:32 +00:00
Svetoslav Ganov
a8cdb6f645 Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff 
am: 13f802dc01

* commit '13f802dc013866986be51328af21378783d19e61':
  Properly set default voice interactor

Change-Id: I29c2a1490877d4b25ca64fee8a53c6970d07a1f2
 2016-06-02 22:47:29 +00:00
Philip P. Moltmann
1889358444 Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e 
am: 1eabaff2cb

* commit '1eabaff2cb9f97c412102a564bc90ce47a8b2adb':
  Do not rotate PDFPrinter pages.

Change-Id: I1988f9f05ca1c16f0aac11b3e58d5b3c9b673985
 2016-06-02 22:47:27 +00:00
Svetoslav Ganov
bd28e027ed Merge "Properly set default voice interactor" into nyc-dev 
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a
 2016-06-02 22:47:26 +00:00
Philip P. Moltmann
e34a1df1ad Merge "Do not rotate PDFPrinter pages." into nyc-dev am: 5d6a4f582e 
am: bf0f82bd69

* commit 'bf0f82bd69433a018fc767fa7bd8ca5145927610':
  Do not rotate PDFPrinter pages.

Change-Id: Ied59f3b9e33e2ff03d1760f6f2958821ba82dda9
 2016-06-02 22:47:26 +00:00
Svetoslav Ganov
13f802dc01 Merge "Properly set default voice interactor" into nyc-dev 
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
 2016-06-02 22:43:41 +00:00
Makoto Onuki
f6be4c023f Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev 2016-06-02 22:42:03 +00:00
Philip P. Moltmann
1eabaff2cb Merge "Do not rotate PDFPrinter pages." into nyc-dev 
am: 5d6a4f582e

* commit '5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
  Do not rotate PDFPrinter pages.

Change-Id: Ib428e9af14a8271545862189649780975053de86
 2016-06-02 22:41:15 +00:00
Suprabh Shukla
5915d1b756 Adding an idle timeout to restart demo session 
Tracking user activity from RetailModeManagerService to start and switch
to a new demo user when there has been no activity for a long time and
the demo video player has been disabled.

Bug: 27280140
Change-Id: Iebf37b5d04a659e4bfda0e4016111c7b9e5f4eb9
 2016-06-02 15:40:51 -07:00
Philip P. Moltmann
bf0f82bd69 Merge "Do not rotate PDFPrinter pages." into nyc-dev 
am: 5d6a4f582e

* commit '5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
  Do not rotate PDFPrinter pages.

Change-Id: I1f24415c1f7245f5bee5fb24f7d642c0e22a3bdd
 2016-06-02 22:37:22 +00:00
Jorim Jaggi
492ac96bf3 Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am: 6321f42fbe am: 02082ad631 
am: 83160236a5

* commit '83160236a57eec340a7eb8ece76e54d0061a00bb':

Change-Id: Iee9f8c19ed1f3bcf0d5e3ada93d13e38e0abfde3
 2016-06-02 22:36:57 +00:00
Svetoslav Ganov
e34bb5a1ff Merge "Properly set default voice interactor" into nyc-dev 2016-06-02 22:36:05 +00:00
Jorim Jaggi
67dcf66274 Merge "Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am: 6321f42fbe am: a80c867adf" into nyc-mr1-dev-plus-aosp 
am: 93032d94f7

* commit '93032d94f795397efceaadc23984814cfffcc5bd':
  Fix unminimizing dock stack for AppTask.moveToFront

Change-Id: Id22fa0453b24e9117660f46ae48d90ba22591462
 2016-06-02 22:31:47 +00:00
Annie Chin
93f250bd14 Merge "Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev am: 84c074adb2" into nyc-mr1-dev-plus-aosp 
am: 64a2480f6c

* commit '64a2480f6c598f037376fea98fcde09ea53c68de':
  Remove SystemUIFactory.getHomeLayoutId()

Change-Id: I256c9e6d7ceec6ae7848d0cd10dd5cd4190c982f
 2016-06-02 22:31:12 +00:00
Billy Lamberta
a7d6a6806e docs: work minisite post-launch fixes am: 9fec73a47c am: 84903c24ed am: a092b6cdb9 am: 3050400767 
am: 97ae77e41b

* commit '97ae77e41b84cc5d78c6e15ce7105d871ae8dd11':

Change-Id: I5241371aec7a646d5119a3605850975f87bb44a7
 2016-06-02 22:31:08 +00:00
TreeHugger Robot
5d6a4f582e Merge "Do not rotate PDFPrinter pages." into nyc-dev 2016-06-02 22:30:24 +00:00
Selim Cinek
41fe89a84a Fixed a bug where talkback couldn't scroll through notifications 
Change-Id: Idac298efe3a25be1d435776817180c3acf78bf84
Fixes: 29046169
 2016-06-02 15:27:56 -07:00