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

177596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
405d58fff8 am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 
* commit 'fd7432276172790a27bd51b75e61d756772eb33b':
  Doc change: Remove disallow /preview from indexing.
 2015-06-11 17:40:53 +00:00
Dirk Dougherty
fd74322761 Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs 2015-06-11 17:31:46 +00:00
Joe Fernandez
fd7a6b0332 am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 
* commit 'd1d8b843dd4b7575438339a15e610deafa060f76':
  Revert "Revert "docs: studio 1.2.2.0 updates""
 2015-06-11 16:33:02 +00:00
Joe Fernandez
d1d8b843dd Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs 2015-06-11 16:24:26 +00:00
Dirk Dougherty
2805148e91 Doc change: Remove disallow /preview from indexing. 
Change-Id: I67ce4395529422a741903d3635085fdea7a2f510
 2015-06-10 18:13:54 -07:00
Rich Sloager
b656acef82 Revert "Revert "docs: studio 1.2.2.0 updates"" 
This reverts commit c9032b1472f4f54b6a7db66921975c808e7db88d.

Change-Id: Ia590d767ed5c280369fbcecd65538c7fc25158a1
 2015-06-11 00:23:42 +00:00
Filip Gruszczynski
6974f22d11 am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." 
* commit '47e53319509474c2f00847ac391dd32776712470':
  Revert "Recompute focus stack if cleared while starting an activity."
 2015-06-09 16:05:22 +00:00
Filip Gruszczynski
47e5331950 Revert "Recompute focus stack if cleared while starting an activity." 
This reverts commit 0b3d573e46b8be0f0cf170802214320859c94905.

Unfortunately, we need more than just that.

Change-Id: I42ac79cb396812b91cec67ba681144592c0e2e01
 2015-06-09 15:55:30 +00:00
Wale Ogunwale
64b586e19f am 0b3d573e: Recompute focus stack if cleared while starting an activity. 
* commit '0b3d573e46b8be0f0cf170802214320859c94905':
  Recompute focus stack if cleared while starting an activity.
 2015-06-09 15:34:40 +00:00
Wale Ogunwale
0b3d573e46 Recompute focus stack if cleared while starting an activity. 
When starting an activity with Intent.FLAG_ACTIVITY_CLEAR_TOP flag,
the activity is destoried which can also cause its task to be removed
from its current stack if the activity process record is null. We now
recompute the stack for the activity task when this occurs so we
don't NPE later on.

Bug: 19552874

Change-Id: I50f51ca6dc32d4642f78d59cae93b0774bc6cdb7
(cherry picked from commit 86920fe630911cbbc0839b341dc694c2b905ef9e)
 2015-06-09 15:21:17 +00:00
Luan Nguyen
33677f0c10 am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit 'd8b632fbce276ca0e91bf2b251aff266869e1291':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 15:01:16 +00:00
Luan Nguyen
d8b632fbce Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 2015-06-09 14:50:50 +00:00
Filip Gruszczynski
17ba2e6c49 am aaf1811d: Calculate outsets before window frame adjustment. 
* commit 'aaf1811dda607f10ab0f0ae80fd2b2b7cf9d0069':
  Calculate outsets before window frame adjustment.
 2015-06-05 23:00:32 +00:00
Luan Nguyen
54fd7224fd docs: Fix WatchFace guide to no longer reference deprecated Time.java 
Also fix links to samples and reference docs.

bug: 20057886
Change-Id: I31aaad7066dabd05f1af8f7ff434ccb79f54357f
 2015-06-05 13:53:44 -07:00
Filip Gruszczynski
aaf1811dda Calculate outsets before window frame adjustment. 
Bug: 21635628
Change-Id: I2d818e6d543c885dca2d19553bad5ce1adda95a6
 2015-06-05 13:37:40 -07:00
Joe Fernandez
edaf008c5e am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit 'b0ebbc8625b9ca165c9cfa2ec0023c8fc1af61a8':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-04 17:37:24 +00:00
Joe Fernandez
b0ebbc8625 Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 2015-06-04 17:27:22 +00:00
Joe Fernandez
c9032b1472 Revert "docs: studio 1.2.2.0 updates" 
This reverts commit bda2bb39717accd08fe56f997b7a46e56f997c5d.

Change-Id: I734cce1d0fdccefa64577b7e0ba68f8afdbfb2d6
 2015-06-04 17:24:59 +00:00
Justin Harrison
6715ef754a am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '4f2927d22415b9a38f34645ae7909592d574c170':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-04 05:33:03 +00:00
Justin Harrison
95be178daf am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit 'c4d7c826486868e31bacfe2265b96af1ff3115ea':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-04 05:32:58 +00:00
Rich Slogar
34bebb0440 am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit '16293cf5f493df47a51a75051cf29532ed9b69eb':
  docs: studio 1.2.2.0 updates
 2015-06-04 00:37:33 +00:00
Rich Slogar
16293cf5f4 Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 2015-06-04 00:26:27 +00:00
Rich Slogar
bda2bb3971 docs: studio 1.2.2.0 updates 
Change-Id: I98ba501ec83ce0a4cbd45ec45460cd56aa78501f
 2015-06-03 17:14:01 -07:00
Justin Harrison
4f2927d224 am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '0eeb3bb8eb211af642b25bc494931bcc47786be7':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-04 00:06:15 +00:00
Justin Harrison
c4d7c82648 am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit 'f8c2ffef5caca1b07bcb6160f4baf9363c5bfe87':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-04 00:06:11 +00:00
Justin Harrison
0eeb3bb8eb am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '33aa55b1cecea2dcecd5e72450dab8cff85c2943':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-03 23:49:25 +00:00
Justin Harrison
f8c2ffef5c am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit 'c8fd50b106534672f0df530df1d8a85fd9304f1c':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-03 23:49:19 +00:00
Luan Nguyen
26c3dd5b03 am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit 'ef7458ed67f5d80a6e6f860779465c63fe72e019':
  docs: Add DevByte embedded video.
 2015-06-03 22:59:05 +00:00
Luan Nguyen
ef7458ed67 Merge "docs: Add DevByte embedded video." into mnc-preview-docs 2015-06-03 22:48:24 +00:00
Filip Gruszczynski
f6a0430592 am 8487c937: Merge "More inclusive rules for using outsets." into cw-d-mr1-dev 
* commit '8487c937fb7eb8159e472011074eaa5f5d51405e':
  More inclusive rules for using outsets.
 2015-06-03 22:45:59 +00:00
Filip Gruszczynski
8487c937fb Merge "More inclusive rules for using outsets." into cw-d-mr1-dev 2015-06-03 22:35:30 +00:00
Justin Harrison
33aa55b1ce am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '127d0b8065cb87fafddd0cf65a33e42afac69672':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-03 21:27:59 +00:00
Justin Harrison
c8fd50b106 am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit '29b988846721eb870df9813a950ef31a2ecacebd':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-03 21:27:54 +00:00
Luan Nguyen
d49e338a1b docs: Add DevByte embedded video. 
Change-Id: Ie8fbf7d56ad6820b4ece724a9d0ba53efa3fb2fd
 2015-06-03 12:41:30 -07:00
Justin Harrison
127d0b8065 Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 2015-06-03 19:20:45 +00:00
Justin Harrison
aa9a679b00 Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" 
This reverts commit c48c31394e7e5dc104d22644d0e4e4a6a607497a.

Change-Id: Ia2b59da5d953a8a692c0e2f5eabb12e952dbdea1
 2015-06-03 19:18:30 +00:00
Justin Harrison
29b9888467 Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 2015-06-03 19:18:06 +00:00
Justin Harrison
c48c31394e Revert "During early boot, send LOCALE_CHANGED only to registered receivers" 
This reverts commit afd883f8a3ee260a5505f83d628c0b789871c837.

Change-Id: Ia4fadbbc7e531d13cd9e9019f0cdb30cc090cb7a
 2015-06-03 18:48:19 +00:00
John Reck
06ae68aac2 am 902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs 
* commit '902ec1c7c660b46d7d643e5c1dd07021f073bfcd':
  Fix framestats docs ordering
 2015-06-03 15:58:58 +00:00
John Reck
902ec1c7c6 Merge "Fix framestats docs ordering" into mnc-preview-docs 2015-06-03 15:45:48 +00:00
David Friedman
cae82287c7 am 6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs 
* commit '6bffab80889ff4283eac626249d082453a9db5c3':
  Docs: Fixes several typos on Android Studio index.html page.
 2015-06-03 01:12:54 +00:00
David Friedman
6bffab8088 Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs 2015-06-03 01:02:38 +00:00
Dirk Dougherty
392f532104 am 5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs 
* commit '5c117ae1fb27a5a94dd37489cdb7b16ddc10c2bf':
  Fix dependency specs for data binding.
 2015-06-02 23:41:40 +00:00
Dirk Dougherty
5c117ae1fb Merge "Fix dependency specs for data binding." into mnc-preview-docs 2015-06-02 23:29:36 +00:00
John Reck
5eff54f79f Fix framestats docs ordering 
Bug: 21560187

Fields were listed in a different order than they were printed

Change-Id: Icea4f442c5f43aef42e0701958249a4dca9e01f0
 2015-06-02 23:01:03 +00:00
Filip Gruszczynski
93634166c8 am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit 'd88e4d50d6198233883a69313fdee2c1a6fff7ca':
  ActivityView: set surface on a background thread.
 2015-06-02 22:36:42 +00:00
Filip Gruszczynski
d88e4d50d6 Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 2015-06-02 22:26:39 +00:00
Chris Craik
78ab4c3867 am 6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs 
* commit '6042f351d21a67e6ebb30d1effce8264772c6a19':
  Rework systrace analysis documentation
 2015-06-02 22:01:19 +00:00
Chris Craik
6042f351d2 Merge "Rework systrace analysis documentation" into mnc-preview-docs 2015-06-02 21:51:31 +00:00
Joe Fernandez
ab1fb23712 am 79106d1c: docs: Remove ADT-1 RMA form link 
* commit '79106d1cdea70d80a8e75655fa94cf794d0e91e0':
  docs: Remove ADT-1 RMA form link
 2015-06-02 21:09:50 +00:00