drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,110 Commits 1 Branch 0 Tags
Commit Graph

63305 Commits

Author SHA1 Message Date
Paul Jensen
66d03ca8c6 am a21622df: am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev automerge: 6ad91cb 
* commit 'a21622df7e1368e7321059a5f5047d2011fd71e5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 20:15:46 +00:00
Dan Sandler
a026f47494 am c45d74f8: am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev automerge: 125fb86 
* commit 'c45d74f81283af6ffaa7e6fde1194e733f00b0f2':
  Materialize default app icon.
 2014-11-05 20:15:41 +00:00
Bryce Lee
35896c530d am 4947ff46: am 1ae5dc12: am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit '4947ff462795ae9927b98fa2346634af5bbbf7c4':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 20:15:32 +00:00
Paul Jensen
a21622df7e am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 
automerge: 6ad91cb

* commit '6ad91cbce2ce7eb175086894e4ee27e1ca4d2e75':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 20:00:46 +00:00
Dan Sandler
c45d74f812 am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev 
automerge: 125fb86

* commit '125fb86ee0cc0e49d6847bed7a76829ad87c1312':
  Materialize default app icon.
 2014-11-05 19:59:19 +00:00
Paul Jensen
6ad91cbce2 am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 
* commit '021a95f761e1bc26cc215a9daedb04af818002f5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2014-11-05 19:11:32 +00:00
Bryce Lee
4947ff4627 am 1ae5dc12: am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit '1ae5dc12d0013835ed5c567b6e8ca3343524f2e3':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 19:06:31 +00:00
Dan Sandler
125fb86ee0 am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev 
* commit 'ac8dbdafeab9db9f44a40ea31d5cdbc1404acb68':
  Materialize default app icon.
 2014-11-05 19:06:25 +00:00
Paul Jensen
021a95f761 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev 2014-11-05 19:05:09 +00:00
Filip Gruszczynski
0f337b776b am cac8e4a5: am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit 'cac8e4a5aaf35e1dae23da3b4557d8f3d37c07b8':
  Automatic brightness using ALS while dozing.
 2014-11-05 19:01:26 +00:00
Bryce Lee
1ae5dc12d0 am ca7f9a4d: am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit 'ca7f9a4d4eaa4a14c45199a586ec25efee7407fa':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 19:00:56 +00:00
Dan Sandler
ac8dbdafea Merge "Materialize default app icon." into lmp-mr1-dev 2014-11-05 18:58:14 +00:00
Filip Gruszczynski
cac8e4a5aa am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit '093e98908743eb37104a280541a060dcd46351d0':
  Automatic brightness using ALS while dozing.
 2014-11-05 18:55:34 +00:00
Bryce Lee
ca7f9a4d4e am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 
* commit '5a818e55a7faee421567eb037ac4e42f20bca0c4':
  Add config to control going to sleep when entering theater mode.
 2014-11-05 18:54:06 +00:00
Filip Gruszczynski
093e989087 am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit '34afdf0276044f7d40c58df65dd13b9cb774d7c6':
  Automatic brightness using ALS while dozing.
 2014-11-05 18:49:39 +00:00
George Mount
253c6c47df am 7291d7b2: Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 automerge: dd185b6 
* commit '7291d7b2c58de6670e1fc6a3af4b4b6c200d1ed0':
  Fix javadoc.
 2014-11-05 18:47:33 +00:00
John Spurlock
a667028207 am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 automerge: 513f260 
* commit '96171f08c121a7d15a6a8cbdb28e49c917418c1f':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 18:47:27 +00:00
George Mount
7291d7b2c5 Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 
automerge: dd185b6

* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
  Fix javadoc.
 2014-11-05 18:03:51 +00:00
Filip Gruszczynski
34afdf0276 Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 2014-11-05 17:39:34 +00:00
Dan Sandler
d29149d2ee Materialize default app icon. 
Bug: 17999428
Change-Id: Ib7430993fc44051c70a802442dce15ca4cd592d4
 2014-11-05 12:02:22 -05:00
George Mount
dd185b657d Merge "Fix javadoc." into lmp-mr1-dev 
automerge: 8b26674

* commit '8b26674aa139965005ff3ba7d284d7d557c2de61':
  Fix javadoc.
 2014-11-05 16:34:41 +00:00
John Spurlock
96171f08c1 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 
automerge: 513f260

* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:42:30 +00:00
George Mount
8b26674aa1 Merge "Fix javadoc." into lmp-mr1-dev 2014-11-05 15:22:43 +00:00
John Spurlock
513f260200 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 
automerge: 0bdefb9

* commit '0bdefb9953fd51c86f81a6033a00926a63916065':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:20:12 +00:00
John Spurlock
0bdefb9953 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 2014-11-05 14:47:20 +00:00
Paul Jensen
c53113b37f Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties() 
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853
 2014-11-05 09:35:26 -05:00
John Spurlock
37bc92cc23 Zen: Create a new exit condition for "next alarm". 
- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
 2014-11-05 08:46:01 -05:00
Jungshik Jang
4acb768ce8 am af45240b: am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit 'af45240bf06faa649cc60be560159de0d246b6a9':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:33:33 +00:00
Jungshik Jang
af45240bf0 am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '9ae3fe48d912d9135684d435d282fa2bb4929a2e':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:29:24 +00:00
Jungshik Jang
9ae3fe48d9 am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '090354861a92c1cf0c8c2baa438d1b770d67dd9f':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:18:44 +00:00
Jungshik Jang
090354861a Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 2014-11-05 05:54:15 +00:00
Alan Viverette
8df94b5659 am b6416716: am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit 'b6416716ad875a800c982dda77bafe910f9ed2d6':
  Use default token instead of wrapped window manager
 2014-11-05 05:03:59 +00:00
Alan Viverette
b6416716ad am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
  Use default token instead of wrapped window manager
 2014-11-05 04:56:40 +00:00
Alan Viverette
6a98dde8df am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '9342b049b9a605b1904e03f904ec3cbf90f7742d':
  Use default token instead of wrapped window manager
 2014-11-05 04:50:50 +00:00
Alan Viverette
9342b049b9 Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 2014-11-05 04:44:22 +00:00
Jungshik Jang
326aef0c94 Add recorder address to all recording listerner apis. 
It enables to recognize which recorder reports record status.

Bug: 18248734
Change-Id: I248ad77212ce584dc16863cbe00639e7ac3c184a
 2014-11-05 13:32:52 +09:00
Alan Viverette
838b7b6d05 am e48b397f: am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit 'e48b397f93fb7ed4b7520d72368c2b4472f7cf5f':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 04:18:26 +00:00
Alan Viverette
a47e3e0572 am 69eb010b: am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit '69eb010b1e2bc002b020b2722cc42447383bb5d3':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 04:18:16 +00:00
Alan Viverette
e48b397f93 am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit '405165b6cd749d0281bb1daa13bdf0a8f38112d9':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 04:06:21 +00:00
Alan Viverette
69eb010b1e am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit 'a77e349a3609833c55ee3b8b80fc5eef5fac4f1a':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 04:05:58 +00:00
Alan Viverette
405165b6cd am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit 'a446195b0d22659ff402e3b6ac76b1b876e5fe3b':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 02:35:15 +00:00
Alan Viverette
a77e349a36 am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit '9c95264e847b02b688e12a3dd75b1e54502b3246':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 02:35:04 +00:00
Filip Gruszczynski
a15aa7d426 Automatic brightness using ALS while dozing. 
Bug: 16525667

Change-Id: Ib75cfebf46f2c122e7b68556591b601d22a318e1
 2014-11-05 02:09:47 +00:00
Alan Viverette
a446195b0d Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 2014-11-05 02:09:30 +00:00
Alan Viverette
9c95264e84 Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 2014-11-05 01:41:28 +00:00
Alan Viverette
d2fa514391 Use default token instead of wrapped window manager 
BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035
 2014-11-04 17:40:29 -08:00
Alan Viverette
2cd23e6b9d Fix hasSurfaceInsets check when creating hardware renderer 
BUG: 17729606
Change-Id: I8c7092428b790e0ff3bbf84b64ba385ef2b2f521
 2014-11-04 17:04:02 -08:00
Alan Viverette
f74a4d7ddc am ffa031bb: am e9596818: am aa33a487: Merge "Always update date picker position after change in range" into lmp-mr1-dev 
* commit 'ffa031bbada658fd33c137e381e219ac248d29fe':
  Always update date picker position after change in range
 2014-11-05 00:17:32 +00:00
Alan Viverette
ffa031bbad am e9596818: am aa33a487: Merge "Always update date picker position after change in range" into lmp-mr1-dev 
* commit 'e9596818e58d912323132c63185719f1e69cbbd5':
  Always update date picker position after change in range
 2014-11-05 00:11:12 +00:00
Alan Viverette
e9596818e5 am aa33a487: Merge "Always update date picker position after change in range" into lmp-mr1-dev 
* commit 'aa33a487c8bfa0503a4c744a932a8344a96d52e1':
  Always update date picker position after change in range
 2014-11-05 00:05:33 +00:00