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

161719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
b1a280a3ee am 052e9b12: Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev 
* commit '052e9b12f5fc7a1e3ecdd126ca8c07298941f291':
  Add config to handle periodic check of tether provision
 2014-12-16 16:59:44 +00:00
Jason Monk
052e9b12f5 Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev 2014-12-16 15:44:07 +00:00
Sarah Maddox
99c5ac9e14 am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627 
* commit '48f9c8e48c5d765afc025c2bda3695d0dd13388e':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 02:00:46 +00:00
smain@google.com
1d97aebdd9 am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455 
* commit '9af05a689964ca2563c038484b385e8dfb58ed3d':
  brute force improve suggestions for sdk download
 2014-12-16 02:00:41 +00:00
Rich Slogar
ccaf3552e6 am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5 
* commit '579110887d9d5d21ca8ed0b4179b61de3b876410':
  docs: studio 1.0.1 revision update
 2014-12-16 02:00:36 +00:00
smain@google.com
f912c21e43 am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1 
* commit 'a01e83b2665e32f0ee74ee97b37e12fe1c9ac986':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 02:00:30 +00:00
Joe Fernandez
9a0be7d31d am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75 
* commit '519fbf3ae7dbf27f62321c727e721f29aa89ac92':
  docs: uiautomator blog link removal
 2014-12-16 02:00:24 +00:00
Joe Fernandez
e33b63feec am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad 
* commit '9a05dee5ece7ba9cf3127bac89b0f3ff1d8448b8':
  docs: studio basics typo
 2014-12-16 01:54:09 +00:00
Luan Nguyen
443e57df26 am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
* commit '556ce7f145de641e0f920ed3059be5a82eb0bb7b':
  docs: Add two new general functionality requirements
 2014-12-16 01:54:03 +00:00
Mark Renouf
3e4a43e4f5 am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours 
* commit '1302ee3a2338dec77da81deca51811e31f693c09':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:53:58 +00:00
Sarah Maddox
48f9c8e48c am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
automerge: 8f0f627

* commit '8f0f627e0e76918a57941c71ad49ea6758f68886':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 01:39:00 +00:00
smain@google.com
9af05a6899 am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download 
automerge: c21b455

* commit 'c21b4553cbdeb8286a49108ec6059871ad81eba2':
  brute force improve suggestions for sdk download
 2014-12-16 01:37:42 +00:00
Rich Slogar
579110887d am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update 
automerge: b2a9bd5

* commit 'b2a9bd5e9b1984b8aeda17b0c1477e9190fc171e':
  docs: studio 1.0.1 revision update
 2014-12-16 01:36:40 +00:00
smain@google.com
a01e83b266 am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
automerge: 63ed5e1

* commit '63ed5e1b7736006f8d4ac5b4e60c453e2b26ad81':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 01:35:19 +00:00
Joe Fernandez
519fbf3ae7 am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
automerge: d799f75

* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
  docs: uiautomator blog link removal
 2014-12-16 01:33:56 +00:00
Joe Fernandez
9a05dee5ec am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs 
automerge: 72268ad

* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
  docs: studio basics typo
 2014-12-16 01:32:49 +00:00
Luan Nguyen
556ce7f145 am 47efca78: am a854ddfd: docs: Add two new general functionality requirements 
automerge: bb01880

* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
  docs: Add two new general functionality requirements
 2014-12-16 01:30:17 +00:00
Mark Renouf
1302ee3a23 If no display settings are matched, return the first one. DO NOT MERGE 
automerge: d3adc51  -s ours

* commit 'd3adc51a1b845e37845af6a885ce7371c2ce252c':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:29:01 +00:00
Brian Carlstrom
2350c7cb12 am a00be9b4: Remember failed dexopt to avoid retry 
* commit 'a00be9b4d521287fdf4678fb196c3e3a0053c3e4':
  Remember failed dexopt to avoid retry
 2014-12-16 00:55:20 +00:00
Jay Shrauner
59e96ee423 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
* commit '12b5e504fd3845fed9c649cf01cd27b84fb6742c':
  Fix NPE in Transport.applyBatch
 2014-12-16 00:55:11 +00:00
Adam Lesinski
465d123464 am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 
* commit '0f0e85a68961e303ac85d31fb36ec8384277349d':
  AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
 2014-12-16 00:54:59 +00:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry 
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
 2014-12-15 15:57:56 -08:00
Jay Shrauner
12b5e504fd Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 2014-12-15 23:56:53 +00:00
Adam Lesinski
0f0e85a689 Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 2014-12-15 23:35:23 +00:00
Jorim Jaggi
93c736b3da am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 
* commit '613fffcd0f17eecb0231fe24f7abf7936eef8d37':
  Revert "Revert "Attempt to fix keyguard missing bug""
 2014-12-15 22:35:56 +00:00
Sarah Maddox
8f0f627e0e am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
* commit 'aaa37da8e0d358317d85e3bc7bfa363c644f5ef1':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-15 21:57:02 +00:00
Sarah Maddox
aaa37da8e0 am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
* commit 'a158abe4542742381861d1360a79db2cdd28be57':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-15 21:50:27 +00:00
Jay Shrauner
ac2506c7e3 Fix NPE in Transport.applyBatch 
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
 2014-12-15 13:25:52 -08:00
Sarah Maddox
a158abe454 Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 2014-12-15 20:42:40 +00:00
Jorim Jaggi
613fffcd0f Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 2014-12-15 19:56:45 +00:00
Amit Mahajan
2fab5307d1 am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit 'd060b50b331f540d42c91501d820e3c2601dec18':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:19:06 +00:00
Jim Miller
a8800f7c27 Revert "Revert "Attempt to fix keyguard missing bug"" 
This reverts commit 1991590ddd0ca6d3a0cac290b65120c147034dbc
and fixes a bug where we were showing the scrim on devices without keyguard.

Bug: 18468369
Change-Id: Idce1370dadacd09c4a8f1a7fd9728c23b218d19c
 2014-12-15 20:12:09 +01:00
Amit Mahajan
d060b50b33 Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 2014-12-15 19:06:48 +00:00
Amit Mahajan
d9835f0c16 Change to treat slotId 0 emergency numbers as default. 
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
 2014-12-15 10:38:27 -08:00
smain@google.com
c21b4553cb am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download 
* commit '16d9a0378fb1c8fbefb263df2e3d627202ae677d':
  brute force improve suggestions for sdk download
 2014-12-15 18:19:05 +00:00
smain@google.com
16d9a0378f am 68e6819b: brute force improve suggestions for sdk download 
* commit '68e6819bd023d24894fc7cbb2357c685177d9b84':
  brute force improve suggestions for sdk download
 2014-12-15 18:10:45 +00:00
smain@google.com
68e6819bd0 brute force improve suggestions for sdk download 
Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384
 2014-12-15 10:00:59 -08:00
Alan Viverette
2f11125a71 am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '9973643bfc123fcc73803542ef8cb74e243907ce':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:31:36 +00:00
Alan Viverette
2311ded6a3 am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2649c58b460c2cd841173a8db513a54180422330':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:31:31 +00:00
Alan Viverette
9973643bfc Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 2014-12-15 17:27:24 +00:00
Alan Viverette
2649c58b46 Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 2014-12-15 17:26:39 +00:00
Geoff Mendal
301a617698 am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd6fc7cf149795abdcd0629e229be52b816ee13c1':
  Import translations. DO NOT MERGE
 2014-12-15 15:17:58 +00:00
Geoff Mendal
b73e02cf5c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 15:11:25 +00:00
Geoff Mendal
d6fc7cf149 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-15 15:10:39 +00:00
Geoff Mendal
099cce32d2 Import translations. DO NOT MERGE 
Change-Id: I1631f2d7e5eca790da4ce7b78e90c626f96be23c
Auto-generated-cl: translation import
 2014-12-15 06:56:40 -08:00
Geoff Mendal
111a81669e Import translations. DO NOT MERGE 
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
 2014-12-15 06:50:18 -08:00
Geoff Mendal
0c8802bb3e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 14:39:49 +00:00
Geoff Mendal
b6a5dab3ed am feb6c7f3: (-s ours) Import translations. DO NOT MERGE 
* commit 'feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21':
  Import translations. DO NOT MERGE
 2014-12-15 14:36:56 +00:00
Geoff Mendal
e184608398 Import translations. DO NOT MERGE 
Change-Id: Ifbbb87b8df40d269d7e28aa398dcacc878c93011
Auto-generated-cl: translation import
 2014-12-15 06:28:48 -08:00
Geoff Mendal
feb6c7f3d6 Import translations. DO NOT MERGE 
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
 2014-12-15 06:25:08 -08:00