Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
258,455 Commits 3 Branches 0 Tags
c6a520e0907447e4bb88c608236804fd36ec00f2
Commit Graph

15998 Commits

Author SHA1 Message Date
Adarsh Fernando
a063331e29 Redirect for AS error message regarding SDK license agreements am: 5fb0843a7f am: fc329098d2 am: 79cb94b8d6 
am: 779adf8879

* commit '779adf8879f94ffa97d0f889f1376c5bb3929ef4':
  Bug: 28875393 Bug: 28879732

Change-Id: I0e09b58fe2627f0858d44eb52807726c03f32760
 2016-06-07 16:21:38 +00:00
William Harmon
779adf8879 Merge "Bug: 28875393 Bug: 28879732" into nyc-mr1-dev 2016-06-07 16:15:38 +00:00
Bill Yi
47f986f6c4 Import translations. DO NOT MERGE 
Change-Id: Ie4d854df968366efde752e7ebe89afbe5aa8183a
Auto-generated-cl: translation import
 2016-06-06 16:10:00 -07:00
Will Harmon
beb1f177ef Bug: 28875393 
Bug: 28879732

Fixes a bug where setting an app as a default quicksettings tile will
show it twice.

Change-Id: Ie71746d85c6782810966c62be416a62545329859
 2016-06-06 14:52:40 -07:00
fionaxu
2581d13f25 Merge "cold sim clean up" into nyc-mr1-dev 
am: ba3428f01b

* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
  cold sim clean up

Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
 2016-06-04 05:53:44 +00:00
Chen Xu
ba3428f01b Merge "cold sim clean up" into nyc-mr1-dev 2016-06-04 05:48:47 +00:00
Selim Cinek
3eec7d66de Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 
am: 6efad815c2

* commit '6efad815c2fc81416d17521a547407dec0528a58':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I4cbe2a13cd2a05dd9c550a0499e72ef5035b92c1
 2016-06-03 23:22:01 +00:00
Selim Cinek
6efad815c2 Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev 
am: 6c94972622

* commit '6c94972622a5fa6c2f0beb16f190015e81584013':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I41bf71eabe7ab90cd93df33c28ac07ad5abd8354
 2016-06-03 22:18:16 +00:00
Selim Cinek
6c94972622 Merge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev 2016-06-03 20:39:25 +00:00
fionaxu
1bf6ec2f86 cold sim clean up 
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
 2016-06-03 11:45:12 -07:00
TreeHugger Robot
ef2989920d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:03 +00:00
TreeHugger Robot
4233404ee4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:53:29 +00:00
Adrian Roos
3c8c89db25 Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc 
am: 50844bc504

* commit '50844bc50429e6e6f4f0d33b177491c25f47e6ce':
  Fix BigText transitions

Change-Id: I822241014f796954ee80e5d3ad2ba747f2ef1f03
 2016-06-03 16:13:46 +00:00
Adrian Roos
50844bc504 Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
 2016-06-03 15:53:09 +00:00
Adrian Roos
d49a86ceda Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235
 2016-06-03 15:53:07 +00:00
TreeHugger Robot
2ab4f451dc Merge "Fix BigText transitions" into nyc-dev 2016-06-03 15:36:11 +00:00
Julia Reynolds
1f8275e314 Don\'t leak guts. am: cdf98e1964 
am: 0853233433

* commit '0853233433958eb9c97d8237341be58895e8a541':
  Don't leak guts.

Change-Id: Ifa768e26b323a46cd595feebaec2e947415b938e
 2016-06-03 13:46:47 +00:00
Julia Reynolds
08cc30378c Don\'t leak guts. 
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
 2016-06-03 13:33:11 +00:00
Julia Reynolds
0853233433 Don\'t leak guts. 
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: Id7e53a4e108280c8b843413fa377ae40ea0acb2e
 2016-06-03 13:33:08 +00:00
Julia Reynolds
cdf98e1964 Don't leak guts. 
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes: 29064258
 2016-06-03 13:17:47 +00:00
Bill Yi
e3a9c58c32 Import translations. DO NOT MERGE 
Change-Id: I46dc39205d2e1652f96638ed246431742c63f93e
Auto-generated-cl: translation import
 2016-06-03 06:01:48 -07:00
Bill Yi
b67c06c31a Import translations. DO NOT MERGE 
Change-Id: I733983cfcd864557c987aa746c3a3f2c249a9c12
Auto-generated-cl: translation import
 2016-06-03 05:23:35 -07: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
Annie Chin
2c446e0a64 Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev 
am: 84c074adb2

* commit '84c074adb251135554f0ce1133ab7ec5d9c4aded':
  Remove SystemUIFactory.getHomeLayoutId()

Change-Id: Iba4ea97d2e92a81fe355a3342e9a8cd7b134d0b5
 2016-06-02 22:20:32 +00:00
Annie Chin
84c074adb2 Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev 2016-06-02 22:10:01 +00:00
Julia Reynolds
bad8e2e37c Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev am: 30e434a996 
am: 84e725309c

* commit '84e725309c468b9f8d49e25562b6ee400c79992e':
  Fix memory leak via ZenModeController callbacks.

Change-Id: I865083fdfb2ddaa77d772d77770c1a48859dc03c
 2016-06-02 21:21:27 +00:00
Julia Reynolds
480cb05866 Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev 
am: 30e434a996

* commit '30e434a996e0053eeeeb41f6a198f3945055445b':
  Fix memory leak via ZenModeController callbacks.

Change-Id: I7d8702f3761ed71b1c06f1eedaa5740cfc2e799e
 2016-06-02 21:14:34 +00:00
Julia Reynolds
84e725309c Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev 
am: 30e434a996

* commit '30e434a996e0053eeeeb41f6a198f3945055445b':
  Fix memory leak via ZenModeController callbacks.

Change-Id: Id392b79729d9f8e560554859260845d3f0972548
 2016-06-02 21:14:09 +00:00
TreeHugger Robot
30e434a996 Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev 2016-06-02 21:05:56 +00:00
Adrian Roos
237ffa48d0 Fix BigText transitions 
Fixes a bug where BigText would never transition
between the expanded and collapsed version because
padding was wrongly taken into account when checking
the view height.

Change-Id: I4df242b4133dacdff77b78cc2d4ff3954b75b8a7
Fixes: 29042222
 2016-06-02 13:16:30 -07:00
Jorim Jaggi
6379e87d06 Merge "Also update setMinLines" into nyc-dev am: 79c0b2bcbb 
am: 8524697351

* commit '8524697351bb034c56bce99b6503225ca121fc71':
  Also update setMinLines

Change-Id: I0dff24ca60c040bc003ccae9b0111a1e437ce255
 2016-06-02 19:52:09 +00:00
Jorim Jaggi
93ef31f1ca Merge "Also update setMinLines" into nyc-dev 
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: Iae144dc953cc9e67225ebad2b2e7be777808d1eb
 2016-06-02 19:45:17 +00:00
Jorim Jaggi
8524697351 Merge "Also update setMinLines" into nyc-dev 
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: I34792f349b421e20849ad1db2a28d2751c994189
 2016-06-02 19:45:09 +00:00
Julia Reynolds
98d4456187 Merge "Fix leak on density change." into nyc-dev am: a31ac7ddfb 
am: f584b1d96d

* commit 'f584b1d96d2d114d57f5c87e9c517b7929854d53':
  Fix leak on density change.

Change-Id: I268a0c2d4096ad7d28c31964c560da88be43b44a
 2016-06-02 19:39:14 +00:00
Julia Reynolds
30721fb490 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a9197 
am: 9548013287

* commit '9548013287f8345177e106cb79bc8c6d621457bd':
  Hide alarm condition if there's no alarm.

Change-Id: Ied3c40add25a0ffa8e766a820e64498e189a7df5
 2016-06-02 19:38:59 +00:00
Jorim Jaggi
79c0b2bcbb Merge "Also update setMinLines" into nyc-dev 2016-06-02 19:34:57 +00:00
Julia Reynolds
f584b1d96d Merge "Fix leak on density change." into nyc-dev 
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I8c474e29100543668a2348baca5f34b868cf8893
 2016-06-02 19:31:11 +00:00
Julia Reynolds
db3744969e Merge "Fix leak on density change." into nyc-dev 
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I4158711144354eb7059d6b421ed35d6673b63a5b
 2016-06-02 19:30:58 +00:00
Julia Reynolds
9548013287 Merge "Hide alarm condition if there\'s no alarm." into nyc-dev 
am: 62716a9197

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: Ib6c339aa3d00639fcad3bc15791787a52010a84f
 2016-06-02 19:30:52 +00:00
Julia Reynolds
b44ef7eb43 Fix memory leak via ZenModeController callbacks. 
Bug: 29064258
Change-Id: Ie817ec50206ce23561775fc0ac178754b946f030
 2016-06-02 19:30:50 +00:00
Julia Reynolds
48347048ba Merge "Hide alarm condition if there\'s no alarm." into nyc-dev 
am: 62716a9197

* commit '62716a9197ba77b349d74770e6cd3b114e5f5de7':
  Hide alarm condition if there's no alarm.

Change-Id: I16ff49b128224db3972335fd1f4b0aee9a06fcb8
 2016-06-02 19:30:50 +00:00
TreeHugger Robot
a31ac7ddfb Merge "Fix leak on density change." into nyc-dev 2016-06-02 19:24:16 +00:00
Annie Chin
b6ab24f4d0 Remove SystemUIFactory.getHomeLayoutId() 
Bug: 29069470

Change-Id: I19078f293c85470caac8d372d80a7a8605842c61
 2016-06-02 12:18:38 -07:00
Julia Reynolds
c3960f66be Hide alarm condition if there's no alarm. 
Change-Id: Iba8c9eb2bd3033683c25c5cf145fc52f9ac0f0d2
Fixes: 27698976
 2016-06-02 18:06:01 +00:00
Amith Yamasani
64fc84e9c7 Merge "Setup user restrictions for demo user" into nyc-mr1-dev 
am: a28576cb72

* commit 'a28576cb7201b468908346b4807892706870df92':
  Setup user restrictions for demo user

Change-Id: I4121f9745f8d582c0c85240a35b6ed442e8f2850
 2016-06-02 18:00:40 +00:00
Amith Yamasani
a28576cb72 Merge "Setup user restrictions for demo user" into nyc-mr1-dev 2016-06-02 17:51:53 +00:00
Mady Mellor
9982d86abc Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 
am: 0e6207ef40

* commit '0e6207ef406d1fad389a9831e6c8816b274ad2b5':
  Parent notifications should always be normal notification color

Change-Id: I73542bc4adf5240ec130bac09ef788248f929a9b
 2016-06-02 16:48:36 +00:00
Selim Cinek
f96c5fd462 Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 
am: 5432938bf6

* commit '5432938bf6838c934cd4e28e094b9d78eca18777':
  Fixed a crash with notification groups

Change-Id: Id90f5d886d1019871172f0f7262f818e9fb2c36a
 2016-06-02 16:48:23 +00:00
Mady Mellor
0e6207ef40 Merge "Parent notifications should always be normal notification color" into nyc-dev 
am: 09ca7e73c0

* commit '09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
  Parent notifications should always be normal notification color

Change-Id: I81160e649188e21d4c763abd8d222fa83608322d
 2016-06-02 16:41:09 +00:00
Selim Cinek
5432938bf6 Merge "Fixed a crash with notification groups" into nyc-dev 
am: c152dacc37

* commit 'c152dacc37bd850b06a37e18fba77308e8c9f939':
  Fixed a crash with notification groups

Change-Id: I6f36c1dae68de0e4741ee74910696869c21b86ec
 2016-06-02 16:41:00 +00:00