Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
274,648 Commits 3 Branches 0 Tags
d90eda5a1189aee34f305df2efe4e034464f9ced
Commit Graph

274648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bert McMeen
d90eda5a11 Merge "Docs: Wear Preview - Release Notes and more" into nyc-dev am: 93d9d85bda 
am: 02419b8e3b

Change-Id: I3dc97954a0c8f1036caadfd7e9e5b02f04e0838d
 2016-09-29 18:15:37 +00:00
Bert McMeen
6756a9a49a Docs: Wear Preview - Release Notes and more am: 289e9c1d9f 
am: 7ba9fd463d

Change-Id: I897ce464ffdb8130743b5951338e7978bd0dd18a
 2016-09-29 18:14:28 +00:00
Jordan Liu
180aadfb86 Merge "Add dial_string_replace key to CarrierConfig" am: 715903f3c6 am: 9fba74dd3a 
am: d34ae93d8b

Change-Id: I6753d00b4d9fed455cb153294f956cf3ad9f826f
 2016-09-29 18:12:39 +00:00
Svet Ganov
c4444752b2 Merge "Add a missing case when detecting if a toast can be added" into nyc-mr1-dev am: fa198f42d3 
am: 0fb32d5ed1

Change-Id: I4aac9b1c71ac0c873e455de44546eec5a8c46c3c
 2016-09-29 17:30:09 +00:00
Svet Ganov
3f16f11e81 Add a missing case when detecting if a toast can be added am: 62a40f87b3 
am: 49dcc90734

Change-Id: I40b52700a3d36f582c66b8eba3e11d440d0f5425
 2016-09-29 17:28:57 +00:00
Svetoslav Ganov
61211895ae Merge "Don't touch usage stats before system ready" into nyc-mr1-dev am: 3462c194db 
am: 14890673be

Change-Id: I2b96d38e6963f614c85b0425182e789b494ed265
 2016-09-29 17:27:55 +00:00
Svetoslav Ganov
734ce67675 Don't touch usage stats before system ready am: 09d3285503 
am: 25681d469d

Change-Id: Ib38f30db325ce2813e2957fc1ee97c21cfb804e6
 2016-09-29 17:26:56 +00:00
Svet Ganov
0fb32d5ed1 Merge "Add a missing case when detecting if a toast can be added" into nyc-mr1-dev 
am: fa198f42d3

Change-Id: I8bd84c6bfc8f8e51f6ac67489c2e339b56430bba
 2016-09-29 17:18:03 +00:00
Svet Ganov
49dcc90734 Add a missing case when detecting if a toast can be added 
am: 62a40f87b3

Change-Id: I445e8d592d8dda5fa3f8c91553a509801110d859
 2016-09-29 17:17:59 +00:00
Svetoslav Ganov
14890673be Merge "Don't touch usage stats before system ready" into nyc-mr1-dev 
am: 3462c194db

Change-Id: I11fa3ed3152f4ccf3af29db09bf59df7c5f0c204
 2016-09-29 17:16:30 +00:00
Svetoslav Ganov
25681d469d Don't touch usage stats before system ready 
am: 09d3285503

Change-Id: Idd27629f73a457e2ee5e3dd9f4d90881cc978e51
 2016-09-29 17:16:28 +00:00
TreeHugger Robot
fa198f42d3 Merge "Add a missing case when detecting if a toast can be added" into nyc-mr1-dev 2016-09-29 17:11:50 +00:00
TreeHugger Robot
3462c194db Merge "Don't touch usage stats before system ready" into nyc-mr1-dev 2016-09-29 17:09:34 +00:00
Sungsoo
06e3740780 Merge changes Ic1e2f5e8,Ida4a3fc1 into nyc-mr1-dev am: e2782906b5 
am: 7590d55a00

Change-Id: If8a6a619eb48ce9c5b8114e5521dfb753bb36b08
 2016-09-29 11:19:13 +00:00
Sungsoo
220f348fb3 Make dispatchAudioRoutesChanged be called when BT A2DP status changed am: 71f3563c39 
am: 139f1e3742

Change-Id: I381779ef9ac0d285a35984b3e92948edb7a3fa8e
 2016-09-29 11:17:52 +00:00
Sungsoo
727ecf0264 Revert "Disable selecting the default audio route when a BT route is avaiable" am: fa6f70e225 
am: 96942eb2ef

Change-Id: Ic6a882104fd7e78886dd0e241a548a94141c653e
 2016-09-29 11:17:09 +00:00
Sungsoo
7590d55a00 Merge changes Ic1e2f5e8,Ida4a3fc1 into nyc-mr1-dev 
am: e2782906b5

Change-Id: I2b32773759a471217bf334ea1d3f02d3fc60a4e9
 2016-09-29 11:05:04 +00:00
Sungsoo
139f1e3742 Make dispatchAudioRoutesChanged be called when BT A2DP status changed 
am: 71f3563c39

Change-Id: I1ed4f2bfe61feb150091b16817547538539c3285
 2016-09-29 11:04:56 +00:00
Sungsoo
96942eb2ef Revert "Disable selecting the default audio route when a BT route is avaiable" 
am: fa6f70e225

Change-Id: Ie3ceb852d7b78eeb7f7492cafbda205f6f313398
 2016-09-29 11:04:07 +00:00
TreeHugger Robot
e2782906b5 Merge changes Ic1e2f5e8,Ida4a3fc1 into nyc-mr1-dev 
* changes:
  Make dispatchAudioRoutesChanged be called when BT A2DP status changed
  Revert "Disable selecting the default audio route when a BT route is avaiable"
 2016-09-29 10:54:20 +00:00
Sungsoo
2eca8e739b Merge changes I8ca2871c,Ia633a159 into nyc-mr1-dev am: f66508ada9 
am: 20b618ccb0

Change-Id: Ia6283edc141ab4382e16cfd247fc9b66503b3165
 2016-09-29 09:38:22 +00:00
Sungsoo
38b5579261 Revert "AudioService: remove deprecated forcing of A2DP off" am: cf09fe6801 
am: 8902c288b7

Change-Id: Icbdf6db61b8b31118f267aa6cdc637afc696e678
 2016-09-29 09:37:03 +00:00
Sungsoo
c6b31397a6 Revert "AudioService: restore A2DP/wired headset auto selection" am: 486f7d3fcd 
am: 3e6a30c07a

Change-Id: Ib6cc5d9d1c7afe1fc094efe611348ddf1720e547
 2016-09-29 09:36:04 +00:00
Sungsoo
20b618ccb0 Merge changes I8ca2871c,Ia633a159 into nyc-mr1-dev 
am: f66508ada9

Change-Id: I74b8fc6cdc0d1a4b7d778bcb29c91cddd997d12c
 2016-09-29 09:28:46 +00:00
Sungsoo
8902c288b7 Revert "AudioService: remove deprecated forcing of A2DP off" 
am: cf09fe6801

Change-Id: I280e6ecf1ede7852031f5e7f5a55231ef242e42e
 2016-09-29 09:28:41 +00:00
Sungsoo
3e6a30c07a Revert "AudioService: restore A2DP/wired headset auto selection" 
am: 486f7d3fcd

Change-Id: I2617b28501a0738ec3fcec68b0cba5e76ac58aeb
 2016-09-29 09:27:29 +00:00
TreeHugger Robot
f66508ada9 Merge changes I8ca2871c,Ia633a159 into nyc-mr1-dev 
* changes:
  Revert "AudioService: remove deprecated forcing of A2DP off"
  Revert "AudioService: restore A2DP/wired headset auto selection"
 2016-09-29 09:19:07 +00:00
Svet Ganov
62a40f87b3 Add a missing case when detecting if a toast can be added 
We allow only one toast window per UID to be added at a
time. We ignore windows that run exit animation but we
should also ignore windows that should be removed after
the exit animation.

bug:31340854

Change-Id: I51c21f2c0e04341697f61e4cc107f9116254b206
 2016-09-29 08:19:52 +00:00
Bill Yi
cbedf9e437 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e7c74c064f -s ours 
am: da62d73d70  -s ours

Change-Id: I0aeaa173964040b89f8711cc222f8845e2316fae
 2016-09-29 07:50:34 +00:00
Bill Yi
4185a7cd85 Import translations. DO NOT MERGE am: 87342b4efb -s ours 
am: 7d7f03b774  -s ours

Change-Id: I4130886f2a923aa06000dd4152164a7f5c4bd4cf
 2016-09-29 07:49:37 +00:00
Bill Yi
a1bcb2fb67 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4f6d64ea0d -s ours 
am: 331cc39563  -s ours

Change-Id: I83c55695fe2ec35fdc6fca753a8c62b90d90a36e
 2016-09-29 07:48:39 +00:00
Bill Yi
59cbce4cab Import translations. DO NOT MERGE am: 3860bee3d0 -s ours 
am: 3024df7772  -s ours

Change-Id: I1b055f0d21b0b200a052bf0f6b98979b7d9f0079
 2016-09-29 07:47:40 +00:00
Bill Yi
76d32ec760 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: b1e6e0c6cd  -s ours

Change-Id: I4d4df109060fa760fbd6b3b6aeffc83e4baf0e75
 2016-09-29 07:44:03 +00:00
Bill Yi
fc56b70616 Import translations. DO NOT MERGE 
am: 92a4f293d1  -s ours

Change-Id: Ieea64fe592effe679fcf5e327a8558a871b6be2b
 2016-09-29 07:43:59 +00:00
Bill Yi
0c7484fe08 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 07e95ca75e  -s ours

Change-Id: Icd021e0bb8dfe54ed8b441bd5883e2ab767bc613
 2016-09-29 07:42:40 +00:00
Bill Yi
30070f06bb Import translations. DO NOT MERGE 
am: 2a2856e023  -s ours

Change-Id: I82c4e746ee7757593fa35798c065eeba5b356ae3
 2016-09-29 07:42:34 +00:00
Bill Yi
da62d73d70 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: e7c74c064f  -s ours

Change-Id: I29a6119ba5af97f06bd7ec41a847d3cfb5fad707
 2016-09-29 07:42:16 +00:00
Bill Yi
7d7f03b774 Import translations. DO NOT MERGE 
am: 87342b4efb  -s ours

Change-Id: I7c839cc344482ac592824d4a3b79791d21d716d6
 2016-09-29 07:42:13 +00:00
Bill Yi
61e96d5a3c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8e44108cf1 -s ours 
am: 0b076441a2  -s ours

Change-Id: Ie7e1cd97a519177a7fdfe9d6a634365f39d2bb5e
 2016-09-29 07:41:27 +00:00
Bill Yi
331cc39563 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 4f6d64ea0d  -s ours

Change-Id: I8c75997247b73ca0c6856f5ba14587f1da01638f
 2016-09-29 07:40:39 +00:00
Bill Yi
3024df7772 Import translations. DO NOT MERGE 
am: 3860bee3d0  -s ours

Change-Id: I20e9ef5633150a5c63afdb562d48fd029279f771
 2016-09-29 07:40:35 +00:00
Bill Yi
b8790f77be Import translations. DO NOT MERGE am: e930d5a5f4 -s ours 
am: 7ab0a985ae  -s ours

Change-Id: Ic929db922d61f1cc29c9765b2786d0af5edfdd9f
 2016-09-29 07:40:23 +00:00
TreeHugger Robot
b1e6e0c6cd Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-29 07:34:45 +00:00
TreeHugger Robot
07e95ca75e Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-09-29 07:34:07 +00:00
TreeHugger Robot
e7c74c064f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-29 07:32:49 +00:00
TreeHugger Robot
4f6d64ea0d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-29 07:32:18 +00:00
Bill Yi
0b076441a2 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 8e44108cf1  -s ours

Change-Id: I5a141346add5639ce1bf707ce5097859cce3bde4
 2016-09-29 07:31:35 +00:00
Bill Yi
7ab0a985ae Import translations. DO NOT MERGE 
am: e930d5a5f4  -s ours

Change-Id: Icf67ef603fa28b6b7036d51adb0251c15a2c8934
 2016-09-29 07:31:33 +00:00
TreeHugger Robot
8e44108cf1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-29 07:24:48 +00:00
Bill Yi
e930d5a5f4 Import translations. DO NOT MERGE 
Change-Id: I0dcb3da3295eebdc6757f614a44aac04396eade0
Auto-generated-cl: translation import
 2016-09-28 22:47:48 -07:00